Merge pull request #10 from ARCANESOFT/develop

Recovering PHP 5.6 Support + Organizing the tests

.scrutinizer.yml

@@ -22,7 +22,7 @@ checks:
 tools:
     external_code_coverage:
         timeout: 600
-        runs: 2
+        runs: 3
     php_code_sniffer:
         enabled: true
         config:

.travis.yml

@@ -3,6 +3,7 @@ language: php
 sudo: false
 
 php:
+  - 5.6
   - 7.0
   - 7.1
   - nightly

composer.json

@@ -16,15 +16,15 @@
     "type":    "library",
     "license": "MIT",
     "require": {
-        "php":             ">=7.0",
+        "php":             ">=5.6.4",
         "arcanesoft/auth": "~2.2",
         "arcanesoft/core": "~2.4"
     },
     "require-dev": {
         "arcanesoft/foundation": "~2.2",
-        "phpunit/phpcov":  "~3.0",
-        "phpunit/phpunit": "~5.0",
-        "mockery/mockery": "0.9.*"
+        "phpunit/phpcov":        "~3.0",
+        "phpunit/phpunit":       "~5.0",
+        "mockery/mockery":       "0.9.*"
     },
     "autoload": {
         "psr-4": {

src/Helpers/ExcludePattern.php

@@ -31,6 +31,8 @@ public static function directories(array $patterns)
                 : $pattern.'/*';
         }
 
-        return array_unique($patterns);
+        asort($patterns);
+
+        return array_values(array_unique($patterns));
     }
 }

src/Http/Routes/Admin/MediaRoutes.php

@@ -20,6 +20,6 @@ class MediaRoutes extends RouteRegistrar
     public function map()
     {
         $this->get('/', 'MediasController@index')
-             ->name('index'); // media::foundation.index
+             ->name('index'); // admin::media.index
     }
 }

tests/MediaApiTest.php → tests/Feature/MediaApiTest.php

@@ -1,12 +1,13 @@
-<?php namespace Arcanesoft\Media\Tests;
+<?php namespace Arcanesoft\Media\Tests\Feature;
 
 use Arcanesoft\Media\Tests\Stubs\Models\User;
+use Arcanesoft\Media\Tests\TestCase;
 use Illuminate\Http\UploadedFile;
 
 /**
  * Class     MediaApiTest
  *
- * @package  Arcanesoft\Media\Tests
+ * @package  Arcanesoft\Media\Tests\Feature
  * @author   ARCANEDEV <[email protected]>
  */
 class MediaApiTest extends TestCase

tests/Unit/Helpers/ExcludePatternTest.php

@@ -0,0 +1,50 @@
+<?php namespace Arcanesoft\Media\Tests\Unit\Helpers;
+
+use Arcanesoft\Media\Helpers\ExcludePattern;
+use Arcanesoft\Media\Tests\TestCase;
+
+/**
+ * Class     ExcludePatternTest
+ *
+ * @package  Arcanesoft\Media\Tests\Unit\Helpers
+ * @author   ARCANEDEV <[email protected]>
+ */
+class ExcludePatternTest extends TestCase
+{
+    /* -----------------------------------------------------------------
+     |  Tests
+     | -----------------------------------------------------------------
+     */
+
+    /**
+     * @test
+     *
+     * @dataProvider getPatternsForDirectoriesToExclude
+     *
+     * @param  array  $patterns
+     * @param  array  $expected
+     */
+    public function it_can_get_exclude_patterns_for_directories(array $patterns, $expected)
+    {
+        $this->assertSame($expected, ExcludePattern::directories($patterns));
+    }
+
+    public function getPatternsForDirectoriesToExclude()
+    {
+        return [
+            [
+                ['folder-1'], ['folder-1', 'folder-1/*'],
+            ],[
+                ['folder-1/*'], ['folder-1', 'folder-1/*'],
+            ],[
+                ['folder-1', 'folder-1/*'], ['folder-1', 'folder-1/*'],
+            ],[
+                ['folder-1/*', 'folder-1'], ['folder-1', 'folder-1/*'],
+            ],[
+                ['folder-1', 'folder-2'], ['folder-1', 'folder-1/*', 'folder-2', 'folder-2/*'],
+            ],[
+                ['folder-2', 'folder-1'], ['folder-1', 'folder-1/*', 'folder-2', 'folder-2/*'],
+            ],
+        ];
+    }
+}

tests/MediaServiceProviderTest.php → tests/Unit/MediaServiceProviderTest.php

@@ -1,9 +1,11 @@
-<?php namespace Arcanesoft\Media\Tests;
+<?php namespace Arcanesoft\Media\Tests\Unit;
+
+use Arcanesoft\Media\Tests\TestCase;
 
 /**
  * Class     MediaServiceProviderTest
  *
- * @package  Arcanesoft\Media\Tests
+ * @package  Arcanesoft\Media\Tests\Unit
  * @author   ARCANEDEV <[email protected]>
  */
 class MediaServiceProviderTest extends TestCase

tests/MediaTest.php → tests/Unit/MediaTest.php

@@ -1,12 +1,13 @@
-<?php namespace Arcanesoft\Media\Tests;
+<?php namespace Arcanesoft\Media\Tests\Unit;
 
 use Arcanesoft\Media\Events;
+use Arcanesoft\Media\Tests\TestCase;
 use Illuminate\Http\UploadedFile;
 
 /**
  * Class     MediaTest
  *
- * @package  Arcanesoft\Media\Tests
+ * @package  Arcanesoft\Media\Tests\Unit
  * @author   ARCANEDEV <[email protected]>
  */
 class MediaTest extends TestCase

tests/Providers/CommandServiceProviderTest.php → tests/Unit/Providers/CommandServiceProviderTest.php

@@ -1,4 +1,4 @@
-<?php namespace Arcanesoft\Media\Tests\Providers;
+<?php namespace Arcanesoft\Media\Tests\Unit\Providers;
 
 use Arcanesoft\Media\Tests\TestCase;