Move custom libs to the source tree

composer.json

@@ -31,8 +31,6 @@
         "erusev/parsedown" : "1.6.0",
         "fguillot/json-rpc" : "1.2.1",
         "fguillot/picodb" : "v1.0.18",
-        "fguillot/simple-validator" : "1.0.1",
-        "fguillot/simple-queue" : "1.0.1",
         "paragonie/random_compat": "2.0.11",
         "pimple/pimple" : "3.2.2",
         "psr/log": "~1.0",
@@ -47,6 +45,9 @@
         "psr-4" : {
             "Kanboard\\" : "app/"
         },
+        "psr-0" : {
+            "": "libs/"
+        },
         "files" : [
             "app/functions.php"
         ]

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "f8d9d35adda9c522defa8e3c519f5a23",
+    "content-hash": "bc94bc536e82cb9a522675ff6bed4dad",
     "packages": [
         {
             "name": "aferrandini/phpqrcode",
@@ -326,91 +326,6 @@
             "homepage": "https://github.com/fguillot/picoDb",
             "time": "2018-03-05T22:39:16+00:00"
         },
-        {
-            "name": "fguillot/simple-queue",
-            "version": "v1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/fguillot/simple-queue.git",
-                "reference": "ce7801c507f9501bcca455129fb04c3d2107d5ff"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/fguillot/simple-queue/zipball/ce7801c507f9501bcca455129fb04c3d2107d5ff",
-                "reference": "ce7801c507f9501bcca455129fb04c3d2107d5ff",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "aws/aws-sdk-php": "~3.0",
-                "mariano/disque-php": "~2.0",
-                "pda/pheanstalk": "~3.0",
-                "php-amqplib/php-amqplib": "2.6.*",
-                "phpunit/phpunit": "5.3.*"
-            },
-            "suggest": {
-                "aws/aws-sdk-php": "Required to use the AWS SQS queue driver (~3.0).",
-                "mariano/disque-php": "Required to use the Disque queue driver (~2.0).",
-                "pda/pheanstalk": "Required to use the Beanstalk queue driver (~3.0).",
-                "php-amqplib/php-amqplib": "Required to use the RabbitMQ queue driver (2.6.*)."
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "SimpleQueue\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Frédéric Guillot"
-                }
-            ],
-            "description": "Abstraction layer for multiple queue systems",
-            "homepage": "https://github.com/fguillot/simple-queue",
-            "time": "2016-06-05T21:34:56+00:00"
-        },
-        {
-            "name": "fguillot/simple-validator",
-            "version": "v1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/fguillot/simpleValidator.git",
-                "reference": "23b0a99c5f11ad74d05f8845feaafbcfd9223eda"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/fguillot/simpleValidator/zipball/23b0a99c5f11ad74d05f8845feaafbcfd9223eda",
-                "reference": "23b0a99c5f11ad74d05f8845feaafbcfd9223eda",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "SimpleValidator": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Frédéric Guillot"
-                }
-            ],
-            "description": "Simple validator library",
-            "homepage": "https://github.com/fguillot/simpleValidator",
-            "time": "2016-06-26T15:09:26+00:00"
-        },
         {
             "name": "gregwar/captcha",
             "version": "v1.1.4",
@@ -902,16 +817,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v3.4.6",
+            "version": "v3.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "a479817ce0a9e4adfd7d39c6407c95d97c254625"
+                "reference": "7a2e1299cc0c4162996f18e347b6356729a55317"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/a479817ce0a9e4adfd7d39c6407c95d97c254625",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/7a2e1299cc0c4162996f18e347b6356729a55317",
-                "reference": "a479817ce0a9e4adfd7d39c6407c95d97c254625",
+                "reference": "7a2e1299cc0c4162996f18e347b6356729a55317",
                 "shasum": ""
             },
             "require": {
@@ -947,7 +862,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-03-05T18:28:11+00:00"
+            "time": "2018-03-28T18:23:39+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",

vendor/composer/autoload_classmap.php

@@ -129,6 +129,7 @@ return array(
     'Kanboard\\Api\\Procedure\\LinkProcedure' => $baseDir . '/app/Api/Procedure/LinkProcedure.php',
     'Kanboard\\Api\\Procedure\\MeProcedure' => $baseDir . '/app/Api/Procedure/MeProcedure.php',
     'Kanboard\\Api\\Procedure\\ProjectFileProcedure' => $baseDir . '/app/Api/Procedure/ProjectFileProcedure.php',
+    'Kanboard\\Api\\Procedure\\ProjectMetadataProcedure' => $baseDir . '/app/Api/Procedure/ProjectMetaDataProcedure.php',
     'Kanboard\\Api\\Procedure\\ProjectPermissionProcedure' => $baseDir . '/app/Api/Procedure/ProjectPermissionProcedure.php',
     'Kanboard\\Api\\Procedure\\ProjectProcedure' => $baseDir . '/app/Api/Procedure/ProjectProcedure.php',
     'Kanboard\\Api\\Procedure\\SubtaskProcedure' => $baseDir . '/app/Api/Procedure/SubtaskProcedure.php',
@@ -741,37 +742,34 @@ return array(
     'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
     'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
     'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-    'SimpleQueue\\Adapter\\AmqpQueueAdapter' => $vendorDir . '/fguillot/simple-queue/src/Adapter/AmqpQueueAdapter.php',
+    'SimpleQueue\\Adapter\\AmqpQueueAdapter' => $baseDir . '/libs/SimpleQueue/Adapter/AmqpQueueAdapter.php',
-    'SimpleQueue\\Adapter\\AwsSqsQueueAdapter' => $vendorDir . '/fguillot/simple-queue/src/Adapter/AwsSqsQueueAdapter.php',
+    'SimpleQueue\\Adapter\\BeanstalkQueueAdapter' => $baseDir . '/libs/SimpleQueue/Adapter/BeanstalkQueueAdapter.php',
-    'SimpleQueue\\Adapter\\BeanstalkQueueAdapter' => $vendorDir . '/fguillot/simple-queue/src/Adapter/BeanstalkQueueAdapter.php',
+    'SimpleQueue\\Exception\\NotSupportedException' => $baseDir . '/libs/SimpleQueue/Exception/NotSupportedException.php',
-    'SimpleQueue\\Adapter\\DisqueQueueAdapter' => $vendorDir . '/fguillot/simple-queue/src/Adapter/DisqueQueueAdapter.php',
+    'SimpleQueue\\Job' => $baseDir . '/libs/SimpleQueue/Job.php',
-    'SimpleQueue\\Adapter\\MemoryQueueAdapter' => $vendorDir . '/fguillot/simple-queue/src/Adapter/MemoryQueueAdapter.php',
+    'SimpleQueue\\Queue' => $baseDir . '/libs/SimpleQueue/Queue.php',
-    'SimpleQueue\\Exception\\NotSupportedException' => $vendorDir . '/fguillot/simple-queue/src/Exception/NotSupportedException.php',
+    'SimpleQueue\\QueueAdapterInterface' => $baseDir . '/libs/SimpleQueue/QueueAdapterInterface.php',
-    'SimpleQueue\\Job' => $vendorDir . '/fguillot/simple-queue/src/Job.php',
+    'SimpleValidator\\Validator' => $baseDir . '/libs/SimpleValidator/Validator.php',
-    'SimpleQueue\\Queue' => $vendorDir . '/fguillot/simple-queue/src/Queue.php',
+    'SimpleValidator\\Validators\\Alpha' => $baseDir . '/libs/SimpleValidator/Validators/Alpha.php',
-    'SimpleQueue\\QueueAdapterInterface' => $vendorDir . '/fguillot/simple-queue/src/QueueAdapterInterface.php',
+    'SimpleValidator\\Validators\\AlphaNumeric' => $baseDir . '/libs/SimpleValidator/Validators/AlphaNumeric.php',
-    'SimpleValidator\\Validator' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validator.php',
+    'SimpleValidator\\Validators\\Base' => $baseDir . '/libs/SimpleValidator/Validators/Base.php',
-    'SimpleValidator\\Validators\\Alpha' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/Alpha.php',
+    'SimpleValidator\\Validators\\Date' => $baseDir . '/libs/SimpleValidator/Validators/Date.php',
-    'SimpleValidator\\Validators\\AlphaNumeric' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/AlphaNumeric.php',
+    'SimpleValidator\\Validators\\Email' => $baseDir . '/libs/SimpleValidator/Validators/Email.php',
-    'SimpleValidator\\Validators\\Base' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/Base.php',
+    'SimpleValidator\\Validators\\Equals' => $baseDir . '/libs/SimpleValidator/Validators/Equals.php',
-    'SimpleValidator\\Validators\\Date' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/Date.php',
+    'SimpleValidator\\Validators\\Exists' => $baseDir . '/libs/SimpleValidator/Validators/Exists.php',
-    'SimpleValidator\\Validators\\Email' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/Email.php',
+    'SimpleValidator\\Validators\\GreaterThan' => $baseDir . '/libs/SimpleValidator/Validators/GreaterThan.php',
-    'SimpleValidator\\Validators\\Equals' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/Equals.php',
+    'SimpleValidator\\Validators\\InArray' => $baseDir . '/libs/SimpleValidator/Validators/InArray.php',
-    'SimpleValidator\\Validators\\Exists' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/Exists.php',
+    'SimpleValidator\\Validators\\Integer' => $baseDir . '/libs/SimpleValidator/Validators/Integer.php',
-    'SimpleValidator\\Validators\\GreaterThan' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/GreaterThan.php',
+    'SimpleValidator\\Validators\\Ip' => $baseDir . '/libs/SimpleValidator/Validators/Ip.php',
-    'SimpleValidator\\Validators\\InArray' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/InArray.php',
+    'SimpleValidator\\Validators\\Length' => $baseDir . '/libs/SimpleValidator/Validators/Length.php',
-    'SimpleValidator\\Validators\\Integer' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/Integer.php',
+    'SimpleValidator\\Validators\\MaxLength' => $baseDir . '/libs/SimpleValidator/Validators/MaxLength.php',
-    'SimpleValidator\\Validators\\Ip' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/Ip.php',
+    'SimpleValidator\\Validators\\MinLength' => $baseDir . '/libs/SimpleValidator/Validators/MinLength.php',
-    'SimpleValidator\\Validators\\Length' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/Length.php',
+    'SimpleValidator\\Validators\\NotEmpty' => $baseDir . '/libs/SimpleValidator/Validators/NotEmpty.php',
-    'SimpleValidator\\Validators\\MaxLength' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/MaxLength.php',
+    'SimpleValidator\\Validators\\NotEquals' => $baseDir . '/libs/SimpleValidator/Validators/NotEquals.php',
-    'SimpleValidator\\Validators\\MinLength' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/MinLength.php',
+    'SimpleValidator\\Validators\\NotInArray' => $baseDir . '/libs/SimpleValidator/Validators/NotInArray.php',
-    'SimpleValidator\\Validators\\NotEmpty' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/NotEmpty.php',
+    'SimpleValidator\\Validators\\Numeric' => $baseDir . '/libs/SimpleValidator/Validators/Numeric.php',
-    'SimpleValidator\\Validators\\NotEquals' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/NotEquals.php',
+    'SimpleValidator\\Validators\\Range' => $baseDir . '/libs/SimpleValidator/Validators/Range.php',
-    'SimpleValidator\\Validators\\NotInArray' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/NotInArray.php',
+    'SimpleValidator\\Validators\\Required' => $baseDir . '/libs/SimpleValidator/Validators/Required.php',
-    'SimpleValidator\\Validators\\Numeric' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/Numeric.php',
+    'SimpleValidator\\Validators\\Unique' => $baseDir . '/libs/SimpleValidator/Validators/Unique.php',
-    'SimpleValidator\\Validators\\Range' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/Range.php',
-    'SimpleValidator\\Validators\\Required' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/Required.php',
-    'SimpleValidator\\Validators\\Unique' => $vendorDir . '/fguillot/simple-validator/src/SimpleValidator/Validators/Unique.php',
     'Symfony\\Component\\Console\\Application' => $vendorDir . '/symfony/console/Application.php',
     'Symfony\\Component\\Console\\CommandLoader\\CommandLoaderInterface' => $vendorDir . '/symfony/console/CommandLoader/CommandLoaderInterface.php',
     'Symfony\\Component\\Console\\CommandLoader\\ContainerCommandLoader' => $vendorDir . '/symfony/console/CommandLoader/ContainerCommandLoader.php',

vendor/composer/autoload_namespaces.php

@@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'SimpleValidator' => array($vendorDir . '/fguillot/simple-validator/src'),
     'Pimple' => array($vendorDir . '/pimple/pimple/src'),
     'PicoDb' => array($vendorDir . '/fguillot/picodb/lib'),
     'Parsedown' => array($vendorDir . '/erusev/parsedown'),
@@ -14,4 +13,5 @@ return array(
     'Otp' => array($vendorDir . '/christian-riesen/otp/src'),
     'JsonRPC' => array($vendorDir . '/fguillot/json-rpc/src'),
     'Eluceo\\iCal' => array($vendorDir . '/eluceo/ical/src'),
+    '' => array($baseDir . '/libs'),
 );

vendor/composer/autoload_psr4.php

@@ -11,7 +11,6 @@ return array(
     'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),
     'Symfony\\Component\\Debug\\' => array($vendorDir . '/symfony/debug'),
     'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
-    'SimpleQueue\\' => array($vendorDir . '/fguillot/simple-queue/src'),
     'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
     'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
     'Kanboard\\' => array($baseDir . '/app'),

vendor/composer/autoload_static.php

@@ -21,7 +21,6 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e
             'Symfony\\Component\\EventDispatcher\\' => 34,
             'Symfony\\Component\\Debug\\' => 24,
             'Symfony\\Component\\Console\\' => 26,
-            'SimpleQueue\\' => 12,
         ),
         'P' => 
         array (
@@ -63,10 +62,6 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e
         array (
             0 => __DIR__ . '/..' . '/symfony/console',
         ),
-        'SimpleQueue\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/fguillot/simple-queue/src',
-        ),
         'Psr\\Log\\' => 
         array (
             0 => __DIR__ . '/..' . '/psr/log/Psr/Log',
@@ -90,13 +85,6 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e
     );
 
     public static $prefixesPsr0 = array (
-        'S' => 
-        array (
-            'SimpleValidator' => 
-            array (
-                0 => __DIR__ . '/..' . '/fguillot/simple-validator/src',
-            ),
-        ),
         'P' => 
         array (
             'Pimple' => 
@@ -139,6 +127,10 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e
         ),
     );
 
+    public static $fallbackDirsPsr0 = array (
+        0 => __DIR__ . '/../..' . '/libs',
+    );
+
     public static $classMap = array (
         'Base32\\Base32' => __DIR__ . '/..' . '/christian-riesen/base32/src/Base32.php',
         'Eluceo\\iCal\\Component' => __DIR__ . '/..' . '/eluceo/ical/src/Eluceo/iCal/Component.php',
@@ -263,6 +255,7 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e
         'Kanboard\\Api\\Procedure\\LinkProcedure' => __DIR__ . '/../..' . '/app/Api/Procedure/LinkProcedure.php',
         'Kanboard\\Api\\Procedure\\MeProcedure' => __DIR__ . '/../..' . '/app/Api/Procedure/MeProcedure.php',
         'Kanboard\\Api\\Procedure\\ProjectFileProcedure' => __DIR__ . '/../..' . '/app/Api/Procedure/ProjectFileProcedure.php',
+        'Kanboard\\Api\\Procedure\\ProjectMetadataProcedure' => __DIR__ . '/../..' . '/app/Api/Procedure/ProjectMetaDataProcedure.php',
         'Kanboard\\Api\\Procedure\\ProjectPermissionProcedure' => __DIR__ . '/../..' . '/app/Api/Procedure/ProjectPermissionProcedure.php',
         'Kanboard\\Api\\Procedure\\ProjectProcedure' => __DIR__ . '/../..' . '/app/Api/Procedure/ProjectProcedure.php',
         'Kanboard\\Api\\Procedure\\SubtaskProcedure' => __DIR__ . '/../..' . '/app/Api/Procedure/SubtaskProcedure.php',
@@ -875,37 +868,34 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e
         'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
         'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
         'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-        'SimpleQueue\\Adapter\\AmqpQueueAdapter' => __DIR__ . '/..' . '/fguillot/simple-queue/src/Adapter/AmqpQueueAdapter.php',
+        'SimpleQueue\\Adapter\\AmqpQueueAdapter' => __DIR__ . '/../..' . '/libs/SimpleQueue/Adapter/AmqpQueueAdapter.php',
-        'SimpleQueue\\Adapter\\AwsSqsQueueAdapter' => __DIR__ . '/..' . '/fguillot/simple-queue/src/Adapter/AwsSqsQueueAdapter.php',
+        'SimpleQueue\\Adapter\\BeanstalkQueueAdapter' => __DIR__ . '/../..' . '/libs/SimpleQueue/Adapter/BeanstalkQueueAdapter.php',
-        'SimpleQueue\\Adapter\\BeanstalkQueueAdapter' => __DIR__ . '/..' . '/fguillot/simple-queue/src/Adapter/BeanstalkQueueAdapter.php',
+        'SimpleQueue\\Exception\\NotSupportedException' => __DIR__ . '/../..' . '/libs/SimpleQueue/Exception/NotSupportedException.php',
-        'SimpleQueue\\Adapter\\DisqueQueueAdapter' => __DIR__ . '/..' . '/fguillot/simple-queue/src/Adapter/DisqueQueueAdapter.php',
+        'SimpleQueue\\Job' => __DIR__ . '/../..' . '/libs/SimpleQueue/Job.php',
-        'SimpleQueue\\Adapter\\MemoryQueueAdapter' => __DIR__ . '/..' . '/fguillot/simple-queue/src/Adapter/MemoryQueueAdapter.php',
+        'SimpleQueue\\Queue' => __DIR__ . '/../..' . '/libs/SimpleQueue/Queue.php',
-        'SimpleQueue\\Exception\\NotSupportedException' => __DIR__ . '/..' . '/fguillot/simple-queue/src/Exception/NotSupportedException.php',
+        'SimpleQueue\\QueueAdapterInterface' => __DIR__ . '/../..' . '/libs/SimpleQueue/QueueAdapterInterface.php',
-        'SimpleQueue\\Job' => __DIR__ . '/..' . '/fguillot/simple-queue/src/Job.php',
+        'SimpleValidator\\Validator' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validator.php',
-        'SimpleQueue\\Queue' => __DIR__ . '/..' . '/fguillot/simple-queue/src/Queue.php',
+        'SimpleValidator\\Validators\\Alpha' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/Alpha.php',
-        'SimpleQueue\\QueueAdapterInterface' => __DIR__ . '/..' . '/fguillot/simple-queue/src/QueueAdapterInterface.php',
+        'SimpleValidator\\Validators\\AlphaNumeric' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/AlphaNumeric.php',
-        'SimpleValidator\\Validator' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validator.php',
+        'SimpleValidator\\Validators\\Base' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/Base.php',
-        'SimpleValidator\\Validators\\Alpha' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/Alpha.php',
+        'SimpleValidator\\Validators\\Date' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/Date.php',
-        'SimpleValidator\\Validators\\AlphaNumeric' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/AlphaNumeric.php',
+        'SimpleValidator\\Validators\\Email' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/Email.php',
-        'SimpleValidator\\Validators\\Base' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/Base.php',
+        'SimpleValidator\\Validators\\Equals' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/Equals.php',
-        'SimpleValidator\\Validators\\Date' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/Date.php',
+        'SimpleValidator\\Validators\\Exists' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/Exists.php',
-        'SimpleValidator\\Validators\\Email' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/Email.php',
+        'SimpleValidator\\Validators\\GreaterThan' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/GreaterThan.php',
-        'SimpleValidator\\Validators\\Equals' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/Equals.php',
+        'SimpleValidator\\Validators\\InArray' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/InArray.php',
-        'SimpleValidator\\Validators\\Exists' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/Exists.php',
+        'SimpleValidator\\Validators\\Integer' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/Integer.php',
-        'SimpleValidator\\Validators\\GreaterThan' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/GreaterThan.php',
+        'SimpleValidator\\Validators\\Ip' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/Ip.php',
-        'SimpleValidator\\Validators\\InArray' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/InArray.php',
+        'SimpleValidator\\Validators\\Length' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/Length.php',
-        'SimpleValidator\\Validators\\Integer' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/Integer.php',
+        'SimpleValidator\\Validators\\MaxLength' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/MaxLength.php',
-        'SimpleValidator\\Validators\\Ip' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/Ip.php',
+        'SimpleValidator\\Validators\\MinLength' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/MinLength.php',
-        'SimpleValidator\\Validators\\Length' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/Length.php',
+        'SimpleValidator\\Validators\\NotEmpty' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/NotEmpty.php',
-        'SimpleValidator\\Validators\\MaxLength' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/MaxLength.php',
+        'SimpleValidator\\Validators\\NotEquals' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/NotEquals.php',
-        'SimpleValidator\\Validators\\MinLength' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/MinLength.php',
+        'SimpleValidator\\Validators\\NotInArray' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/NotInArray.php',
-        'SimpleValidator\\Validators\\NotEmpty' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/NotEmpty.php',
+        'SimpleValidator\\Validators\\Numeric' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/Numeric.php',
-        'SimpleValidator\\Validators\\NotEquals' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/NotEquals.php',
+        'SimpleValidator\\Validators\\Range' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/Range.php',
-        'SimpleValidator\\Validators\\NotInArray' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/NotInArray.php',
+        'SimpleValidator\\Validators\\Required' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/Required.php',
-        'SimpleValidator\\Validators\\Numeric' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/Numeric.php',
+        'SimpleValidator\\Validators\\Unique' => __DIR__ . '/../..' . '/libs/SimpleValidator/Validators/Unique.php',
-        'SimpleValidator\\Validators\\Range' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/Range.php',
-        'SimpleValidator\\Validators\\Required' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/Required.php',
-        'SimpleValidator\\Validators\\Unique' => __DIR__ . '/..' . '/fguillot/simple-validator/src/SimpleValidator/Validators/Unique.php',
         'Symfony\\Component\\Console\\Application' => __DIR__ . '/..' . '/symfony/console/Application.php',
         'Symfony\\Component\\Console\\CommandLoader\\CommandLoaderInterface' => __DIR__ . '/..' . '/symfony/console/CommandLoader/CommandLoaderInterface.php',
         'Symfony\\Component\\Console\\CommandLoader\\ContainerCommandLoader' => __DIR__ . '/..' . '/symfony/console/CommandLoader/ContainerCommandLoader.php',
@@ -1043,6 +1033,7 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e
             $loader->prefixLengthsPsr4 = ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e::$prefixDirsPsr4;
             $loader->prefixesPsr0 = ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e::$fallbackDirsPsr0;
             $loader->classMap = ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e::$classMap;
 
         }, null, ClassLoader::class);

vendor/composer/installed.json

@@ -291,95 +291,6 @@
         "description": "Simple Json-RPC client/server library that just works",
         "homepage": "https://github.com/fguillot/JsonRPC"
     },
-    {
-        "name": "fguillot/simple-queue",
-        "version": "v1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/fguillot/simple-queue.git",
-            "reference": "ce7801c507f9501bcca455129fb04c3d2107d5ff"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fguillot/simple-queue/zipball/ce7801c507f9501bcca455129fb04c3d2107d5ff",
-            "reference": "ce7801c507f9501bcca455129fb04c3d2107d5ff",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "require-dev": {
-            "aws/aws-sdk-php": "~3.0",
-            "mariano/disque-php": "~2.0",
-            "pda/pheanstalk": "~3.0",
-            "php-amqplib/php-amqplib": "2.6.*",
-            "phpunit/phpunit": "5.3.*"
-        },
-        "suggest": {
-            "aws/aws-sdk-php": "Required to use the AWS SQS queue driver (~3.0).",
-            "mariano/disque-php": "Required to use the Disque queue driver (~2.0).",
-            "pda/pheanstalk": "Required to use the Beanstalk queue driver (~3.0).",
-            "php-amqplib/php-amqplib": "Required to use the RabbitMQ queue driver (2.6.*)."
-        },
-        "time": "2016-06-05T21:34:56+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "SimpleQueue\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Frédéric Guillot"
-            }
-        ],
-        "description": "Abstraction layer for multiple queue systems",
-        "homepage": "https://github.com/fguillot/simple-queue"
-    },
-    {
-        "name": "fguillot/simple-validator",
-        "version": "v1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/fguillot/simpleValidator.git",
-            "reference": "23b0a99c5f11ad74d05f8845feaafbcfd9223eda"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fguillot/simpleValidator/zipball/23b0a99c5f11ad74d05f8845feaafbcfd9223eda",
-            "reference": "23b0a99c5f11ad74d05f8845feaafbcfd9223eda",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2016-06-26T15:09:26+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "SimpleValidator": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Frédéric Guillot"
-            }
-        ],
-        "description": "Simple validator library",
-        "homepage": "https://github.com/fguillot/simpleValidator"
-    },
     {
         "name": "psr/log",
         "version": "1.0.2",
@@ -992,23 +903,23 @@
     },
     {
         "name": "symfony/finder",
-        "version": "v3.4.6",
+        "version": "v3.4.7",
-        "version_normalized": "3.4.6.0",
+        "version_normalized": "3.4.7.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/finder.git",
-            "reference": "a479817ce0a9e4adfd7d39c6407c95d97c254625"
+            "reference": "7a2e1299cc0c4162996f18e347b6356729a55317"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/finder/zipball/a479817ce0a9e4adfd7d39c6407c95d97c254625",
+            "url": "https://api.github.com/repos/symfony/finder/zipball/7a2e1299cc0c4162996f18e347b6356729a55317",
-            "reference": "a479817ce0a9e4adfd7d39c6407c95d97c254625",
+            "reference": "7a2e1299cc0c4162996f18e347b6356729a55317",
             "shasum": ""
         },
         "require": {
             "php": "^5.5.9|>=7.0.8"
         },
-        "time": "2018-03-05T18:28:11+00:00",
+        "time": "2018-03-28T18:23:39+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {

vendor/fguillot/simple-queue/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Frédéric Guillot
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

vendor/fguillot/simple-queue/src/Adapter/AwsSqsQueueAdapter.php

@@ -1,150 +0,0 @@
-<?php
-
-namespace SimpleQueue\Adapter;
-
-use Aws\Sqs\SqsClient;
-use SimpleQueue\Job;
-use SimpleQueue\QueueAdapterInterface;
-use DateTime;
-
-/**
- * Class AwsSqsQueueAdapter
- *
- * @package SimpleQueue\Adapter
- * @author George Webb <george@webb.uno>
- */
-class AwsSqsQueueAdapter implements QueueAdapterInterface
-{
-    /**
-     * @var string
-     */
-    private $queueName;
-
-    /**
-     * @var SqsClient
-     */
-    private $sqsClient;
-
-    /**
-     * @var string
-     */
-    private $sqsUrl;
-
-    /**
-     * @var array
-     */
-    private $config;
-
-    /**
-     * AwsSqsQueueAdapter constructor.
-     *
-     * @param string    $queueName  The name of the SQS queue
-     * @param SqsClient $sqsClient  An SQS client
-     * @param array     $config     Array of config values
-     */
-    public function __construct($queueName, SqsClient $sqsClient, $config = array())
-    {
-        $this->queueName = $queueName;
-        $this->sqsClient = $sqsClient;
-        $this->sqsUrl = $this->sqsClient->getQueueUrl(array('QueueName' => $this->queueName))->get('QueueUrl');
-        $this->config = $config;
-    }
-
-    /**
-     * Send a job
-     *
-     * @access public
-     * @param  Job $job
-     * @return $this
-     */
-    public function push(Job $job)
-    {
-        $this->sqsClient->sendMessage(array(
-            'QueueUrl' => $this->sqsUrl,
-            'MessageBody' => $job->serialize()
-        ));
-        return $this;
-    }
-
-    /**
-     * Schedule a job in the future
-     *
-     * @access public
-     * @param  Job      $job
-     * @param  DateTime $dateTime
-     * @return $this
-     */
-    public function schedule(Job $job, DateTime $dateTime)
-    {
-        $now = new DateTime();
-        $when = clone($dateTime);
-        $delay = $when->getTimestamp() - $now->getTimestamp();
-
-        $this->sqsClient->sendMessage(array(
-            'QueueUrl' => $this->sqsUrl,
-            'MessageBody' => $job->serialize(),
-            'VisibilityTimeout' => $delay
-        ));
-
-        return $this;
-    }
-
-    /**
-     * Wait and get job from a queue
-     *
-     * @access public
-     * @return Job|null
-     */
-    public function pull()
-    {
-        $result = $this->sqsClient->receiveMessage(array(
-            'QueueUrl' => $this->sqsUrl,
-            'WaitTimeSeconds' => empty($this->config['LongPollingTime']) ? 0 : (int) $this->config['LongPollingTime']
-        ));
-
-        if ($result['Messages'] == null) {
-            return null;
-        }
-
-        $resultMessage = array_pop($result['Messages']);
-
-        $job = new Job();
-        $job->setId($resultMessage['ReceiptHandle']);
-        $job->unserialize($resultMessage['Body']);
-
-        return $job;
-    }
-
-    /**
-     * Acknowledge a job
-     *
-     * @access public
-     * @param  Job $job
-     * @return $this
-     */
-    public function completed(Job $job)
-    {
-        $this->sqsClient->deleteMessage(array(
-            'QueueUrl' => $this->sqsUrl,
-            'ReceiptHandle' => $job->getId()
-        ));
-        return $this;
-    }
-
-    /**
-     * Mark a job as failed
-     *
-     * @access public
-     * @param  Job $job
-     * @return $this
-     */
-    public function failed(Job $job)
-    {
-        $this->sqsClient->changeMessageVisibility(array(
-            'QueueUrl' => $this->sqsUrl,
-            'ReceiptHandle' => $job->getId(),
-            'VisibilityTimeout' => 0
-        ));
-        return $this;
-    }
-}

vendor/fguillot/simple-queue/src/Adapter/DisqueQueueAdapter.php

@@ -1,109 +0,0 @@
-<?php
-
-namespace SimpleQueue\Adapter;
-
-use DateTime;
-use Disque\Client as DisqueClient;
-use Disque\Queue\Job as DisqueJob;
-use SimpleQueue\Job;
-use SimpleQueue\QueueAdapterInterface;
-
-/**
- * Class DisqueQueueAdapter
- *
- * @package SimpleQueue\Adapter
- */
-class DisqueQueueAdapter implements QueueAdapterInterface
-{
-    /**
-     * @var DisqueClient
-     */
-    protected $disque;
-
-    /**
-     * @var string
-     */
-    protected $queueName;
-
-    /**
-     * DisqueQueueAdapter constructor.
-     *
-     * @param DisqueClient $disque
-     * @param string       $queueName
-     */
-    public function __construct(DisqueClient $disque, $queueName)
-    {
-        $this->disque = $disque;
-        $this->queueName = $queueName;
-    }
-
-    /**
-     * Send a job
-     *
-     * @access public
-     * @param  Job $job
-     * @return $this
-     */
-    public function push(Job $job)
-    {
-        $this->disque->queue($this->queueName)->push(new DisqueJob($job->getBody()));
-        return $this;
-    }
-
-    /**
-     * Schedule a job in the future
-     *
-     * @access public
-     * @param  Job      $job
-     * @param  DateTime $dateTime
-     * @return $this
-     */
-    public function schedule(Job $job, DateTime $dateTime)
-    {
-        $this->disque->queue($this->queueName)->schedule(new DisqueJob($job->serialize()), $dateTime);
-        return $this;
-    }
-
-    /**
-     * Wait and get job from a queue
-     *
-     * @access public
-     * @return Job|null
-     */
-    public function pull()
-    {
-        $disqueJob = $this->disque->queue($this->queueName)->pull();
-
-        if ($disqueJob === null) {
-            return null;
-        }
-
-        return new Job($disqueJob->getBody(), $disqueJob->getId());
-    }
-
-    /**
-     * Acknowledge a job
-     *
-     * @access public
-     * @param  Job $job
-     * @return $this
-     */
-    public function completed(Job $job)
-    {
-        $this->disque->queue($this->queueName)->processed(new DisqueJob($job->getBody(), $job->getId()));
-        return $this;
-    }
-
-    /**
-     * Mark a job as failed
-     *
-     * @access public
-     * @param  Job $job
-     * @return $this
-     */
-    public function failed(Job $job)
-    {
-        $this->disque->queue($this->queueName)->failed(new DisqueJob($job->getBody(), $job->getId()));
-        return $this;
-    }
-}

vendor/fguillot/simple-queue/src/Adapter/MemoryQueueAdapter.php

@@ -1,100 +0,0 @@
-<?php
-
-namespace SimpleQueue\Adapter;
-
-use DateTime;
-use Exception;
-use SimpleQueue\Exception\NotSupportedException;
-use SimpleQueue\QueueAdapterInterface;
-use SimpleQueue\Job;
-use SplQueue;
-
-/**
- * Class MemoryAdapter
- *
- * @package SimpleQueue\Adapter
- */
-class MemoryQueueAdapter implements QueueAdapterInterface
-{
-    /**
-     * @var SplQueue
-     */
-    protected $queue;
-
-    /**
-     * MemoryAdapter constructor.
-     */
-    public function __construct()
-    {
-        $this->queue = new SplQueue();
-    }
-
-    /**
-     * Send a job
-     *
-     * @access public
-     * @param  Job $job
-     * @return $this
-     */
-    public function push(Job $job)
-    {
-        $this->queue->enqueue($job->serialize());
-        return $this;
-    }
-
-    /**
-     * Schedule a job in the future
-     *
-     * @access public
-     * @param  Job      $job
-     * @param  DateTime $dateTime
-     * @return bool
-     * @throws NotSupportedException
-     */
-    public function schedule(Job $job, DateTime $dateTime)
-    {
-        throw new NotSupportedException('Job delay is not supported by MemoryQueue');
-    }
-
-    /**
-     * Wait and get job from a queue
-     *
-     * @access public
-     * @return Job|null
-     */
-    public function pull()
-    {
-        try {
-            $job = new Job();
-            $payload = $this->queue->dequeue();
-            return $job->unserialize($payload);
-        } catch (Exception $e) {
-            return null;
-        }
-    }
-
-    /**
-     * Acknowledge a job
-     *
-     * @access public
-     * @param  Job $job
-     * @return $this
-     */
-    public function completed(Job $job)
-    {
-        return $this;
-    }
-
-    /**
-     * Mark a job as failed
-     *
-     * @access public
-     * @param  Job $job
-     * @return $this
-     */
-    public function failed(Job $job)
-    {
-        $this->queue->enqueue($job->serialize());
-        return $this;
-    }
-}

vendor/fguillot/simple-validator/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Frederic Guillot
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

vendor/symfony/finder/SplFileInfo.php

@@ -28,7 +28,7 @@ class SplFileInfo extends \SplFileInfo
      */
     public function __construct($file, $relativePath, $relativePathname)
     {
-        parent::__construct($file);
+        parent::__construct(realpath($file) ?: $file);
         $this->relativePath = $relativePath;
         $this->relativePathname = $relativePathname;
     }

vendor/symfony/finder/Tests/FinderTest.php

@@ -46,6 +46,20 @@ class FinderTest extends Iterator\RealIteratorTestCase
         $this->assertIterator($this->toAbsolute(array('foo/bar.tmp', 'test.php', 'test.py', 'foo bar')), $finder->in(self::$tmpDir)->getIterator());
     }
 
+    public function testRemoveTrailingSlash()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('This test cannot be run on Windows.');
+        }
+
+        $finder = $this->buildFinder();
+
+        $expected = $this->toAbsolute(array('foo/bar.tmp', 'test.php', 'test.py', 'foo bar'));
+        $in = '//'.realpath(self::$tmpDir).'//';
+
+        $this->assertIterator($expected, $finder->in($in)->files()->getIterator());
+    }
+
     public function testDepth()
     {
         $finder = $this->buildFinder();
@@ -514,8 +528,8 @@ class FinderTest extends Iterator\RealIteratorTestCase
         $finder->in($locations)->depth('< 10')->name('*.neon');
 
         $expected = array(
-            __DIR__.'/Fixtures/one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'c.neon',
+            __DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'c.neon',
-            __DIR__.'/Fixtures/one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'d.neon',
+            __DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'d.neon',
         );
 
         $this->assertIterator($expected, $finder);