Merge pull request codemix#154 from codemix/refine-test-config

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

.travis.yml

@@ -1,15 +1,14 @@
 language: php
+dist: trusty
 php:
+  - "7.4"
+  - "7.3"
+  - "7.2"
+  - "7.1"
   - "7.0"
+  - "5.6"
 
 install:
   - sudo apt-get update
   - travis_retry composer self-update && composer --version
-  - travis_retry composer clear-cache
-  - export PATH="$HOME/.composer/vendor/bin:$PATH"
-  - travis_retry composer install --prefer-dist --no-interaction --no-progress
-  - travis_retry composer require --dev phpunit/phpunit:^6.0 --prefer-dist --no-interaction --no-progress
-
-script:
-  - php -doutput_buffering=On vendor/bin/phpunit
-
+  - travis_retry composer install --no-interaction --no-progress

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"
+    }
+  }
 }

phpunit.xml.dist

@@ -8,7 +8,7 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
+         stderr="true"
          bootstrap="./tests/bootstrap.php"
 >
     <testsuites>

tests/EventTest.php

@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 use \codemix\localeurls\LanguageChangedEvent;

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',

tests/RedirectWithBaseUrlAndScriptNameTest.php

@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

tests/RedirectWithBaseUrlTest.php

@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

tests/RedirectWithScriptNameTest.php

@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

tests/SlugRedirectTest.php

@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

tests/SlugRedirectWithBaseUrlTest.php

@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

tests/SlugRedirectWithScriptNameAndBaseUrlTest.php

@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

tests/SlugRedirectWithScriptNameTest.php

@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

tests/TestCase.php

@@ -1,4 +1,7 @@
 <?php
+namespace tests;
+
+use Yii;
 use yii\helpers\ArrayHelper;
 use yii\di\Container;
 

tests/TestUrlRule.php

@@ -1,4 +1,7 @@
 <?php
+namespace tests;
+
+use Yii;
 use yii\web\UrlRuleInterface;
 
 class TestUrlRule implements UrlRuleInterface

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',

tests/UrlCreationWithBaseUrlAndScriptNameTest.php

@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

tests/UrlCreationWithBaseUrlTest.php

@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

tests/UrlCreationWithScriptNameTest.php

@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

tests/UrlManagerTest.php

@@ -1,5 +1,7 @@
 <?php
+namespace tests;
 
+use Yii;
 use yii\helpers\Url;
 
 class UrlManagerTest extends TestCase

tests/UrlManagerWithBaseUrlTest.php

@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

tests/UrlManagerWithScriptNameAndBaseUrlTest.php

@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;
 

tests/UrlManagerWithScriptNameTest.php

@@ -1,4 +1,5 @@
 <?php
+namespace tests;
 
 use yii\helpers\Url;