Merge pull request #190 from tadasauciunas/master

Update deprecated packages, allow symfony/console ^5.0
widmogrod · Dec 29, 2020 · dfc8c81 · dfc8c81
2 parents c5de06a + 9da123e
commit dfc8c81
Show file tree

Hide file tree

Showing 15 changed files with 3,245 additions and 1,383 deletions.
diff --git a/.php_cs b/.php_cs
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,8 @@
 language: php
 
 php:
- - 5.6
- - 7.0
- - 7.1
+ - 7.3
+ - 7.4
  - hhvm
 
 matrix:

diff --git a/composer.json b/composer.json
@@ -24,15 +24,15 @@
     "bin/assetic"
   ],
   "require": {
-    "php": "^5.6 || ^7.0",
-    "kriswallsmith/assetic": "^1.2",
+    "php": "^7.3",
+    "assetic/framework": "~2.0.0",
     "widmogrod/php-functional": "^1.0",
     "zendframework/zend-mvc": "^3.0",
-    "symfony/console": "^3.1.3"
+    "symfony/console": "^3.1.3 | ^4.0 | ^5.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.4",
-    "fabpot/php-cs-fixer": "^1.12"
+    "phpunit/phpunit": "^9",
+    "friendsofphp/php-cs-fixer": "^2.17"
   },
   "suggest": {
     "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
@@ -41,7 +41,7 @@
   "scripts": {
     "test": "phpunit",
     "fix-code": "php-cs-fixer fix",
-    "check-code": "php-cs-fixer fix --verbose --diff --dry-run"
+    "check-code": "php-cs-fixer fix src/ --verbose --diff --dry-run --using-cache=no"
   },
   "autoload": {
     "psr-0": {
-Original file line number
+Diff line change
@@ -1,9 +1,8 @@
     language: php
     php:
-     - 5.6
-     - 7.0
-     - 7.1
+     - 7.3
+     - 7.4
      - hhvm
     matrix:
@@ Expand Down @@