Test against newer PHP versions and use require/autoload-dev

DeryabinSergey · Jan 7, 2020 · b92efe9 · b92efe9
1 parent f681040
commit b92efe9
Show file tree

Hide file tree

Showing 22 changed files with 65 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,9 @@
 language: php
 php:
+  - "7.4"
+  - "7.3"
+  - "7.2"
+  - "7.1"
   - "7.0"
 
 install:

diff --git a/composer.json b/composer.json
@@ -1,27 +1,35 @@
 {
-    "name": "codemix/yii2-localeurls",
-    "description": "Automatic locale/language management for URLs.",
-    "keywords": ["yii2", "i18n", "locale"],
-    "type": "yii2-extension",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Michael Härtl",
-            "email": "[email protected]"
-        }
-    ],
-    "require": {
-      "yiisoft/yii2": "*"
-    },
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://asset-packagist.org"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "codemix\\localeurls\\": ""
-        }
+  "name": "codemix/yii2-localeurls",
+  "description": "Automatic locale/language management for URLs.",
+  "keywords": ["yii2", "i18n", "locale"],
+  "type": "yii2-extension",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Michael Härtl",
+      "email": "[email protected]"
     }
+  ],
+  "require": {
+    "yiisoft/yii2": "*"
+  },
+  "require-dev": {
+    "phpunit/phpunit": ">4.0 <8"
+  },
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://asset-packagist.org"
+    }
+  ],
+  "autoload": {
+    "psr-4": {
+      "codemix\\localeurls\\": ""
+    }
+  },
+  "autoload-dev": {
+      "psr-4": {
+          "tests\\": "tests"
+      }
+  }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,7 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
+         stderr="true"
          bootstrap="./tests/bootstrap.php"
 >
     <testsuites>

diff --git a/tests/EventTest.php b/tests/EventTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 use \codemix\localeurls\LanguageChangedEvent;

diff --git a/tests/RedirectTest.php b/tests/RedirectTest.php
@@ -1,5 +1,7 @@
 <?php
+namespace tests;
 
+use Yii;
 use yii\helpers\Url;
 
 class RedirectTest extends TestCase
@@ -47,7 +49,7 @@ class RedirectTest extends TestCase
                     '/custom' => 'test/action',
                     '/slug/<name>' => 'test/slug',
                     [
-                        'class' => 'TestUrlRule',
+                        'class' => '\tests\TestUrlRule',
                     ],
                     [
                         'pattern' => '/slash',
@@ -179,7 +181,7 @@ class RedirectTest extends TestCase
                     '/custom' => 'test/action',
                     '/slug/<name>' => 'test/slug',
                     [
-                        'class' => 'TestUrlRule',
+                        'class' => '\tests\TestUrlRule',
                     ],
                     [
                         'pattern' => '/slash',

diff --git a/tests/RedirectWithBaseUrlAndScriptNameTest.php b/tests/RedirectWithBaseUrlAndScriptNameTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

diff --git a/tests/RedirectWithBaseUrlTest.php b/tests/RedirectWithBaseUrlTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

diff --git a/tests/RedirectWithScriptNameTest.php b/tests/RedirectWithScriptNameTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

diff --git a/tests/SlugRedirectTest.php b/tests/SlugRedirectTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

diff --git a/tests/SlugRedirectWithBaseUrlTest.php b/tests/SlugRedirectWithBaseUrlTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

diff --git a/tests/SlugRedirectWithScriptNameAndBaseUrlTest.php b/tests/SlugRedirectWithScriptNameAndBaseUrlTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

diff --git a/tests/SlugRedirectWithScriptNameTest.php b/tests/SlugRedirectWithScriptNameTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,4 +1,7 @@
 <?php
+namespace tests;
+
+use Yii;
 use yii\helpers\ArrayHelper;
 use yii\di\Container;
 

diff --git a/tests/TestUrlRule.php b/tests/TestUrlRule.php
@@ -1,4 +1,7 @@
 <?php
+namespace tests;
+
+use Yii;
 use yii\web\UrlRuleInterface;
 
 class TestUrlRule implements UrlRuleInterface

diff --git a/tests/UrlCreationTest.php b/tests/UrlCreationTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 use yii\helpers\Url;
 
 class UrlCreationTest extends TestCase
@@ -35,7 +36,7 @@ class UrlCreationTest extends TestCase
                     '/custom/<term:.+>/bar' => 'demo/custom',
                     'http://www.example.com/foo/<term:.+>/bar' => 'demo/absolute-slug',
                     [
-                        'class' => 'TestUrlRule',
+                        'class' => '\tests\TestUrlRule',
                     ],
                     [
                         'pattern' => '/slash',

diff --git a/tests/UrlCreationWithBaseUrlAndScriptNameTest.php b/tests/UrlCreationWithBaseUrlAndScriptNameTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

diff --git a/tests/UrlCreationWithBaseUrlTest.php b/tests/UrlCreationWithBaseUrlTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

diff --git a/tests/UrlCreationWithScriptNameTest.php b/tests/UrlCreationWithScriptNameTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

diff --git a/tests/UrlManagerTest.php b/tests/UrlManagerTest.php
@@ -1,5 +1,7 @@
 <?php
+namespace tests;
 
+use Yii;
 use yii\helpers\Url;
 
 class UrlManagerTest extends TestCase

diff --git a/tests/UrlManagerWithBaseUrlTest.php b/tests/UrlManagerWithBaseUrlTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

diff --git a/tests/UrlManagerWithScriptNameAndBaseUrlTest.php b/tests/UrlManagerWithScriptNameAndBaseUrlTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

diff --git a/tests/UrlManagerWithScriptNameTest.php b/tests/UrlManagerWithScriptNameTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;