make error output prettier

10 files changed, 493 insertions, 5 deletions

diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 4e05d3b15..5e1469e83 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -351,7 +351,7 @@ class ClassLoader
             foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
                             return $file;
                         }
                     }
@@ -361,7 +361,7 @@ class ClassLoader
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -380,7 +380,7 @@ class ClassLoader
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -390,7 +390,7 @@ class ClassLoader
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                 return $file;
             }
         }
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index 761f12c54..196c02aa5 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -8,4 +8,5 @@ $baseDir = dirname($vendorDir);
 return array(
     'PicoFeed' => array($vendorDir . '/fguillot/picofeed/lib'),
     'HTMLPurifier' => array($vendorDir . '/ezyang/htmlpurifier/library'),
+    '' => array($vendorDir . '/plasmaconduit/path/src'),
 );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index bc9f5d663..2baf9cc99 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -120,7 +120,7 @@
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/1e89a3fd579cf3d83cc65c09047f92f81ce6a923",
+            "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/8ed3f1a9f777938611645d523ddc707a7cd0e7d7",
             "reference": "1e89a3fd579cf3d83cc65c09047f92f81ce6a923",
             "shasum": ""
         },
@@ -157,5 +157,33 @@
         ],
         "description": "Modern library to handle RSS/Atom feeds",
         "homepage": "https://github.com/fguillot/picoFeed"
+    },
+    {
+        "name": "plasmaconduit/path",
+        "version": "0.1.1",
+        "version_normalized": "0.1.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/JosephMoniz/php-path.git",
+            "reference": "7c19ff02615defcf0b56968589aa1b53b0ee7ebe"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/JosephMoniz/php-path/zipball/7c19ff02615defcf0b56968589aa1b53b0ee7ebe",
+            "reference": "7c19ff02615defcf0b56968589aa1b53b0ee7ebe",
+            "shasum": ""
+        },
+        "require-dev": {
+            "phpspec/phpspec2": "*"
+        },
+        "time": "2013-01-23 06:47:38",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "": "src"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/"
     }
 ]
diff --git a/vendor/plasmaconduit/path/.gitignore b/vendor/plasmaconduit/path/.gitignore
new file mode 100644
index 000000000..a5d906ee0
--- /dev/null
+++ b/vendor/plasmaconduit/path/.gitignore
@@ -0,0 +1,3 @@
+bin
+vendor
+composer.phar
diff --git a/vendor/plasmaconduit/path/.travis.yml b/vendor/plasmaconduit/path/.travis.yml
new file mode 100644
index 000000000..8928b4105
--- /dev/null
+++ b/vendor/plasmaconduit/path/.travis.yml
@@ -0,0 +1,15 @@
+language: php
+
+php:
+  - 5.3
+  - 5.4
+
+branches:
+  only:
+    - master
+
+before_script:
+  - curl http://getcomposer.org/installer | php
+  - php composer.phar --dev install
+
+script: bin/phpspec run -n
diff --git a/vendor/plasmaconduit/path/README.md b/vendor/plasmaconduit/path/README.md
new file mode 100644
index 000000000..cc04b5aa7
--- /dev/null
+++ b/vendor/plasmaconduit/path/README.md
@@ -0,0 +1,22 @@
+Path
+====
+
+[![Build Status](https://travis-ci.org/JosephMoniz/php-path.png?branch=master)](undefined)
+
+Simple and care free file path concatenation and simplification.
+
+```php
+<?php
+use PlasmaConduit\Path;
+
+Path::join("wat", "lol");              // -> wat/lol
+Path::join("/a", "///b");              // -> /a/b
+Path::join("/a", "b", "c", "..", "d"); // -> /a/b/d
+
+Path::normalize("/a/b/c/../d");       // -> /a/b/d
+Path::normalize("/a/b/c/../../d");    // -> /a/d
+Path::normalize("/b/wat//");          // -> /b/wat/
+Path::normalize("/b///wat/");         // -> /b/wat/
+Path::normalize("");                  // -> .
+Path::normalize("/");                 // -> /
+```
\ No newline at end of file
diff --git a/vendor/plasmaconduit/path/composer.json b/vendor/plasmaconduit/path/composer.json
new file mode 100644
index 000000000..2cfdb2a37
--- /dev/null
+++ b/vendor/plasmaconduit/path/composer.json
@@ -0,0 +1,16 @@
+{
+    "name": "plasmaconduit/path",
+    "version": "0.1.1",
+    "require-dev": {
+        "phpspec/phpspec2": "*"
+    },
+    "config": {
+        "bin-dir": "bin"
+    },
+    "autoload": {
+        "psr-0": {
+            "": "src"
+        }
+    },
+    "minimum-stability": "dev"
+}
diff --git a/vendor/plasmaconduit/path/composer.lock b/vendor/plasmaconduit/path/composer.lock
new file mode 100644
index 000000000..a361416fb
--- /dev/null
+++ b/vendor/plasmaconduit/path/composer.lock
@@ -0,0 +1,291 @@
+{
+    "hash": "c03937476cc66c7ae1a9a8c9fc9d6c8a",
+    "packages": [
+
+    ],
+    "packages-dev": [
+        {
+            "name": "mockery/mockery",
+            "version": "0.7.2",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/padraic/mockery.git",
+                "reference": "0.7.2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/padraic/mockery/zipball/0.7.2",
+                "reference": "0.7.2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "suggest": {
+                "Hamcrest": "1.0.0"
+            },
+            "time": "2012-01-24 12:22:39",
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Mockery": "library/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "New BSD"
+            ],
+            "authors": [
+                {
+                    "name": "Pádraic Brady",
+                    "email": "padraic.brady@gmail.com",
+                    "homepage": "http://blog.astrumfutura.com"
+                }
+            ],
+            "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succint API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.",
+            "homepage": "http://github.com/padraic/mockery",
+            "keywords": [
+                "testing",
+                "library",
+                "BDD",
+                "TDD",
+                "test",
+                "mockery",
+                "mock",
+                "stub",
+                "test double",
+                "mock objects"
+            ]
+        },
+        {
+            "name": "phpspec/php-diff",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/php-diff.git",
+                "reference": "8d82ac415225fac373a4073ba14b1fe286aa2312"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/phpspec/php-diff/archive/8d82ac415225fac373a4073ba14b1fe286aa2312.zip",
+                "reference": "8d82ac415225fac373a4073ba14b1fe286aa2312",
+                "shasum": ""
+            },
+            "time": "2012-11-08 08:55:45",
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Diff": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Boulton",
+                    "homepage": "http://github.com/chrisboulton"
+                }
+            ],
+            "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays)."
+        },
+        {
+            "name": "phpspec/phpspec2",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/phpspec2.git",
+                "reference": "4eb75390b81363664d9e7519631cdb87c79fe23b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/phpspec/phpspec2/archive/4eb75390b81363664d9e7519631cdb87c79fe23b.zip",
+                "reference": "4eb75390b81363664d9e7519631cdb87c79fe23b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1",
+                "mockery/mockery": "0.7.*",
+                "symfony/console": ">=2.1.0,<2.2.0",
+                "symfony/event-dispatcher": ">=2.1.0,<2.2.0",
+                "symfony/finder": ">=2.1.0,<2.2.0",
+                "phpspec/php-diff": "*@dev"
+            },
+            "time": "2012-10-31 15:46:10",
+            "bin": [
+                "bin/phpspec"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "PHPSpec2": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "homepage": "http://marcelloduarte.net/"
+                }
+            ],
+            "description": "Specification-oriented BDD framework for PHP 5.4",
+            "homepage": "http://phpspec.net/",
+            "keywords": [
+                "BDD",
+                "TDD",
+                "spec",
+                "SpecBDD",
+                "specification"
+            ]
+        },
+        {
+            "name": "symfony/console",
+            "version": "2.1.x-dev",
+            "target-dir": "Symfony/Component/Console",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Console",
+                "reference": "v2.1.7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/symfony/Console/archive/v2.1.7.zip",
+                "reference": "v2.1.7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "time": "2013-01-17 15:20:05",
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Console": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "http://symfony.com"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "2.1.x-dev",
+            "target-dir": "Symfony/Component/EventDispatcher",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/EventDispatcher",
+                "reference": "v2.1.7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/symfony/EventDispatcher/archive/v2.1.7.zip",
+                "reference": "v2.1.7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "symfony/dependency-injection": "2.1.*"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "2.1.*",
+                "symfony/http-kernel": "2.1.*"
+            },
+            "time": "2013-01-11 00:31:43",
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\EventDispatcher": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony EventDispatcher Component",
+            "homepage": "http://symfony.com"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "2.1.x-dev",
+            "target-dir": "Symfony/Component/Finder",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Finder",
+                "reference": "v2.1.7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/symfony/Finder/archive/v2.1.7.zip",
+                "reference": "v2.1.7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "time": "2013-01-09 08:51:07",
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Finder": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "http://symfony.com"
+        }
+    ],
+    "aliases": [
+
+    ],
+    "minimum-stability": "dev",
+    "stability-flags": [
+
+    ]
+}
diff --git a/vendor/plasmaconduit/path/spec/PlasmaConduit/Path.php b/vendor/plasmaconduit/path/spec/PlasmaConduit/Path.php
new file mode 100644
index 000000000..56236f222
--- /dev/null
+++ b/vendor/plasmaconduit/path/spec/PlasmaConduit/Path.php
@@ -0,0 +1,47 @@
+<?php
+namespace spec\PlasmaConduit;
+use PHPSpec2\ObjectBehavior;
+
+class Path extends ObjectBehavior {
+
+    public function it_should_concat_two_peices_for_join() {
+        Path::join("wat", "lol")->shouldReturn("wat/lol");
+    }
+
+    public function it_should_drop_excess_slashes_for_join() {
+        Path::join("/a", "///b")->shouldReturn("/a/b");
+    }
+
+    public function it_should_correctly_traverse_for_join() {
+        Path::join("/a", "b", "c", "..", "d")->shouldReturn("/a/b/d");
+    }
+
+    public function it_should_filter_empty_peices_for_join() {
+        Path::join("", "lonely")->shouldReturn("lonely");
+    }
+
+    public function it_should_correctly_traverse_for_normalize() {
+        Path::normalize("/a/b/c/../d")->shouldReturn("/a/b/d");
+    }
+
+    public function it_should_do_multiple_traversals_for_normalize() {
+        Path::normalize("/a/b/c/../../d")->shouldReturn("/a/d");
+    }
+
+    public function it_should_drop_trailing_extra_slashes_for_normalize() {
+        Path::normalize("/b/wat//")->shouldReturn("/b/wat/");
+    }
+
+    public function it_should_drop_extra_slashes_for_normalize() {
+        Path::normalize("/b///wat/")->shouldReturn("/b/wat/");
+    }
+
+    public function it_should_resolve_empty_as_dot() {
+        Path::normalize("")->shouldReturn(".");
+    }
+
+    public function it_should_return_slash_for_slash() {
+        Path::normalize("/")->shouldReturn("/");
+    }
+
+}
diff --git a/vendor/plasmaconduit/path/src/PlasmaConduit/Path.php b/vendor/plasmaconduit/path/src/PlasmaConduit/Path.php
new file mode 100644
index 000000000..0db583d7e
--- /dev/null
+++ b/vendor/plasmaconduit/path/src/PlasmaConduit/Path.php
@@ -0,0 +1,65 @@
+<?php
+namespace PlasmaConduit;
+
+class Path {
+
+    /**
+     * This function takes a variable amount of strings and joins
+     * them together so that they form a valid file path.
+     *
+     * @param {String ...} $peice - The peices of the file path
+     * @returns {String}          - The final file path
+     */
+    static public function join() {
+        $peices = array_filter(func_get_args(), function($value) {
+            return $value;
+        });
+        return self::normalize(implode("/", $peices));
+    }
+
+    /**
+     * This function takes a valid file path and nomalizes it into
+     * the simplest form possible.
+     *
+     * @param {String} $path - The path to normalize
+     * @returns {String}     - The normailized path
+     */
+    static public function normalize($path) {
+        if (!strlen($path)) {
+            return ".";
+        }
+
+        $isAbsolute    = $path[0];
+        $trailingSlash = $path[strlen($path) - 1];
+
+        $up     = 0;
+        $peices = array_values(array_filter(explode("/", $path), function($n) {
+                    return !!$n;
+                }));
+        for ($i = count($peices) - 1; $i >= 0; $i--) {
+            $last = $peices[$i];
+            if ($last == ".") {
+                array_splice($peices, $i, 1);
+            } else if ($last == "..") {
+                array_splice($peices, $i, 1);
+                $up++;
+            } else if ($up) {
+                array_splice($peices, $i, 1);
+                $up--;
+            }
+        }
+
+        $path = implode("/", $peices);
+
+        if (!$path && !$isAbsolute) {
+            $path = ".";
+        }
+
+        if ($path && $trailingSlash == "/") {
+            $path .= "/";
+        }
+
+        return ($isAbsolute == "/" ? "/" : "") . $path;
+    }
+
+}
\ No newline at end of file