Merge pull request #66 from foxycode/master

Dropped Nette 2.3 and PHP under 5.6 support

Author: enumag

.travis.yml

@@ -7,10 +7,10 @@ cache:
         - $HOME/.composer/cache
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
+  - 7.1
+  - 7.2
 
 services:
   - rabbitmq
@@ -19,22 +19,21 @@ env:
   matrix:
     - NETTE=nette-2.4-dev
     - NETTE=nette-2.4
-    - NETTE=nette-2.3
 
 matrix:
   include:
     - php: 5.6
-      env: NETTE=nette-2.3 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
+      env: NETTE=nette-2.4 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
     - php: 7.0
       env: NETTE=nette-2.4 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
   exclude:
-    - php: 5.4
+    - php: 7.1
       env: NETTE=nette-2.4-dev
-    - php: 5.4
+    - php: 7.1
       env: NETTE=nette-2.4
-    - php: 5.5
+    - php: 7.2
       env: NETTE=nette-2.4-dev
-    - php: 5.5
+    - php: 7.2
       env: NETTE=nette-2.4
 
 before_install:

composer.json

@@ -17,37 +17,37 @@
 	],
 	"require": {
 		"php": ">=5.4",
-		"nette/di": "~2.2@dev",
-		"nette/utils": "~2.2@dev",
+		"nette/di": "~2.4@dev",
+		"nette/utils": "~2.4@dev",
 
 		"php-amqplib/php-amqplib": "~2.6.2"
 	},
 	"require-dev": {
-		"nette/application": "~2.3@dev",
-		"nette/bootstrap": "~2.3@dev",
-		"nette/caching": "~2.3@dev",
-		"nette/component-model": "~2.2@dev",
-		"nette/database": "~2.3@dev",
-		"nette/deprecated": "~2.2@dev",
-		"nette/di": "~2.3@dev",
-		"nette/finder": "~2.3@dev",
-		"nette/forms": "~2.3@dev",
-		"nette/http": "~2.3@dev",
-		"nette/mail": "~2.3@dev",
-		"nette/neon": "~2.3@dev",
-		"nette/php-generator": "~2.3@dev",
-		"nette/reflection": "~2.3@dev",
-		"nette/robot-loader": "~2.3@dev",
+		"nette/application": "~2.4@dev",
+		"nette/bootstrap": "~2.4@dev",
+		"nette/caching": "~2.4@dev",
+		"nette/component-model": "~2.3@dev",
+		"nette/database": "~2.4@dev",
+		"nette/deprecated": "~2.3@dev",
+		"nette/di": "~2.4@dev",
+		"nette/finder": "~2.4@dev",
+		"nette/forms": "~2.4@dev",
+		"nette/http": "~2.4@dev",
+		"nette/mail": "~2.4@dev",
+		"nette/neon": "~2.4@dev",
+		"nette/php-generator": "~2.4@dev",
+		"nette/reflection": "~2.4@dev",
+		"nette/robot-loader": "~2.4@dev",
 		"nette/safe-stream": "~2.3@dev",
-		"nette/security": "~2.3@dev",
-		"nette/tokenizer": "~2.2@dev",
-		"nette/utils": "~2.3@dev",
-		"latte/latte": "~2.3@dev",
-		"tracy/tracy": "~2.3@dev",
+		"nette/security": "~2.4@dev",
+		"nette/tokenizer": "~2.3@dev",
+		"nette/utils": "~2.4@dev",
+		"latte/latte": "~2.4@dev",
+		"tracy/tracy": "~2.4@dev",
 
 		"nette/tester": "~1.3@rc",
 		"mockery/mockery": "~0.9.1",
-		"kdyby/console": "~2.3@dev"
+		"kdyby/console": "~2.5@dev"
 	},
 	"support": {
 		"email": "filip@prochazka.su",

tests/KdybyTests/RabbitMq/Extension.phpt

@@ -35,8 +35,7 @@ class ExtensionTest extends TestCase
 		$config = new Nette\Configurator();
 		$config->setTempDirectory(TEMP_DIR);
 		Kdyby\RabbitMq\DI\RabbitMqExtension::register($config);
-		$configVersion = !isset($config->defaultExtensions['nette']) ? 'v23' : 'v22';
-		$config->addConfig(__DIR__ . '/../nette-reset.' . $configVersion . '.neon');
+		$config->addConfig(__DIR__ . '/files/nette-reset.neon');
 		$config->addConfig(__DIR__ . '/files/default.neon');
 
 		return $config->createContainer();