Merge pull request #28 from xificurk/2.x-ci

CI update pro 2.x

.travis.yml

@@ -4,29 +4,38 @@ language: php
 sudo: false
 
 env:
-    - NETTE=2.4
+    - NETTE=2 COMPOSER_ARGS=""
+    - NETTE=2 COMPOSER_ARGS="--prefer-lowest"
+    - NETTE=3 COMPOSER_ARGS=""
+    - NETTE=3 COMPOSER_ARGS="--prefer-lowest"
     - NETTE=master
 
 php:
     - 5.6
     - 7.0
     - 7.1
-    - hhvm
-
-matrix:
-    allow_failures:
-        - php: hhvm
-    include:
-        - php: 7.1
-          env:
-              - NETTE=3.0
+    - 7.2
+    - 7.3
+    - 7.4
+
+jobs:
+    exclude:
+        - php: 5.6
+          env: NETTE=3 COMPOSER_ARGS=""
+        - php: 5.6
+          env: NETTE=3 COMPOSER_ARGS="--prefer-lowest"
+        - php: 7.0
+          env: NETTE=3 COMPOSER_ARGS=""
+        - php: 7.0
+          env: NETTE=3 COMPOSER_ARGS="--prefer-lowest"
 
 before_install:
     - composer self-update
     - php tests/prepare-composer.php
 
 install:
-    - composer install --no-interaction --prefer-dist
+    - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" || ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then composer require --dev nette/tester ^2.0; fi
+    - composer update --no-interaction --prefer-dist $COMPOSER_ARGS
 
 script:
     - vendor/bin/tester tests -s -c tests/php-unix.ini -p php

composer.json

@@ -18,14 +18,15 @@
 	"require": {
 		"php": ">=5.6",
 		"skautis/skautis": "^2.0",
-		"nette/di": "^2.4 || ^3.0",
-		"nette/http": "^2.4 || ^3.0",
-		"nette/utils": "^2.4 || ^3.0"
+		"nette/di": "^2.4.6 || ^3.0.1",
+		"nette/http": "^2.4.7 || ^3.0",
+		"nette/utils": "^2.5.4 || ^3.0"
 	},
 	"require-dev": {
-		"nette/tester": "^2.0",
-		"tracy/tracy": "^2.5 || ^3.0",
-		"nette/caching": "^2.4 || ^3.0",
+		"nette/tester": "^2.3.1",
+		"tracy/tracy": "^2.5",
+		"nette/caching": "^2.5 || ^3.0",
+		"nette/finder": "^2.4",
 		"nette/bootstrap": "^2.4 || ^3.0"
 	},
     "suggest": {
@@ -36,6 +37,5 @@
 		"psr-4": {
 			"Skautis\\Nette\\": "src/"
 		}
-	},
-	"minimum-stability": "stable"
+	}
 }

tests/composer-nette-2.4.json → tests/composer-nette-2.json

@@ -17,22 +17,25 @@
 	},
 	"require": {
 		"php": ">=5.6",
-		"skautis/skautis": "~2.0@dev",
-		"nette/utils": "2.4.*",
-		"nette/di": "2.4.*",
-		"nette/http": "2.4.*"
+		"skautis/skautis": "^2.0",
+		"nette/di": "^2.4.6",
+		"nette/http": "^2.4.7",
+		"nette/utils": "^2.5.4"
 	},
 	"require-dev": {
-		"nette/tester": "2.0.*",
-		"nette/caching": "2.4.*",
-		"nette/bootstrap": "2.4.*",
-		"tracy/tracy": "2.4.*"
+		"nette/tester": "^2.3.1",
+		"tracy/tracy": "^2.5",
+		"nette/caching": "^2.5",
+		"nette/finder": "^2.4",
+		"nette/bootstrap": "^2.4"
+	},
+	"suggest": {
+		"tracy/tracy": "to enable skautis panel for Tracy debug bar.",
+		"nette/caching": "to use Nette caching backend in CacheDecorator."
 	},
 	"autoload": {
 		"psr-4": {
 			"Skautis\\Nette\\": "src/"
 		}
-	},
-	"minimum-stability": "stable",
-	"prefer-stable": true
+	}
 }

tests/composer-nette-3.0.json → tests/composer-nette-3.json

@@ -17,22 +17,25 @@
 	},
 	"require": {
 		"php": ">=7.1",
-		"skautis/skautis": "~2.0@dev",
-		"nette/utils": "3.0.*",
-		"nette/di": "3.0.*",
-		"nette/http": "3.0.*"
+		"skautis/skautis": "^2.0",
+		"nette/di": "^3.0.1",
+		"nette/http": "^3.0",
+		"nette/utils": "^3.0"
 	},
 	"require-dev": {
-		"nette/tester": "2.0.*",
-		"nette/caching": "3.0.*",
-		"nette/bootstrap": "3.0.*",
-		"tracy/tracy": "2.4.*"
+		"nette/tester": "^2.3.1",
+		"tracy/tracy": "^2.5",
+		"nette/caching": "^3.0",
+		"nette/finder": "^2.5.1",
+		"nette/bootstrap": "^3.0"
+	},
+	"suggest": {
+		"tracy/tracy": "to enable skautis panel for Tracy debug bar.",
+		"nette/caching": "to use Nette caching backend in CacheDecorator."
 	},
 	"autoload": {
 		"psr-4": {
 			"Skautis\\Nette\\": "src/"
 		}
-	},
-	"minimum-stability": "stable",
-	"prefer-stable": true
+	}
 }