Create 4.x branch (on master) (#82)

consolidation · Oct 29, 2019 · fa89f6f · fa89f6f
1 parent cad3cf2
commit fa89f6f
Show file tree

Hide file tree

Showing 4 changed files with 508 additions and 296 deletions.
diff --git a/.scenarios.lock/install b/.scenarios.lock/install
@@ -4,16 +4,16 @@ SCENARIO=$1
 DEPENDENCIES=${2-install}
 
 # Convert the aliases 'highest', 'lowest' and 'lock' to
-# the corresponding composer command to run.
+# the corresponding composer update command to run.
 case $DEPENDENCIES in
   highest)
-    DEPENDENCIES=update
+    UPDATE_COMMAND=update
     ;;
   lowest)
-    DEPENDENCIES='update --prefer-lowest'
+    UPDATE_COMMAND='update --prefer-lowest'
     ;;
   lock|default|"")
-    DEPENDENCIES=install
+    UPDATE_COMMAND=''
     ;;
 esac
 
@@ -48,7 +48,11 @@ echo
 set -ex
 
 composer -n validate --working-dir=$dir --no-check-all --ansi
-composer -n --working-dir=$dir ${DEPENDENCIES} --prefer-dist --no-scripts
+
+if [ ! -z "$UPDATE_COMMAND" ] ; then
+  composer -n --working-dir=$dir ${UPDATE_COMMAND} --prefer-dist --no-scripts
+fi
+composer -n --working-dir=$dir install --prefer-dist
 
 # If called from a CI context, print out some extra information about
 # what we just installed.

diff --git a/composer.json b/composer.json
@@ -21,15 +21,15 @@
     "require": {
         "php": ">=5.4.0",
         "dflydev/dot-access-data": "^1.1.0",
-        "symfony/console": "^2.8|^3|^4",
-        "symfony/finder": "^2.5|^3|^4"
+        "symfony/console": "^4",
+        "symfony/finder": "^4"
     },
     "require-dev": {
         "g1a/composer-test-scenarios": "^3",
         "php-coveralls/php-coveralls": "^1",
         "phpunit/phpunit": "^5.7.27",
         "squizlabs/php_codesniffer": "^2.7",
-        "symfony/var-dumper": "^2.8|^3|^4",
+        "symfony/var-dumper": "^4",
         "victorjonsson/markdowndocs": "^1.3"
     },
     "suggest": {
@@ -39,7 +39,7 @@
         "optimize-autoloader": true,
         "sort-packages": true,
         "platform": {
-            "php": "5.6.32"
+            "php": "7.1.3"
         }
     },
     "scripts": {
@@ -58,54 +58,8 @@
         ]
     },
     "extra": {
-        "scenarios": {
-            "symfony4": {
-                "require": {
-                    "symfony/console": "^4.0"
-                },
-                "require-dev": {
-                    "phpunit/phpunit": "^6"
-                },
-                "config": {
-                    "platform": {
-                        "php": "7.1.3"
-                    }
-                }
-            },
-            "symfony3": {
-                "require": {
-                    "symfony/console": "^3.4",
-                    "symfony/finder": "^3.4",
-                    "symfony/var-dumper": "^3.4"
-                },
-                "config": {
-                    "platform": {
-                        "php": "5.6.32"
-                    }
-                }
-            },
-            "symfony2": {
-                "require": {
-                    "symfony/console": "^2.8"
-                },
-                "require-dev": {
-                    "phpunit/phpunit": "^4.8.36"
-                },
-                "remove": [
-                    "php-coveralls/php-coveralls"
-                ],
-                "config": {
-                    "platform": {
-                        "php": "5.4.8"
-                    }
-                },
-                "scenario-options": {
-                    "create-lockfile": "false"
-                }
-            }
-        },
         "branch-alias": {
-            "dev-master": "3.x-dev"
+            "dev-master": "4.x-dev"
         }
     }
 }