Update composer-merge-plugin, bump PHP versions

userfrosting · Mar 6, 2021 · ab33733 · ab33733
1 parent 4d00974
commit ab33733
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php_versions: ['7.1', '7.2', '7.3', '7.4']
+        php_versions: ['7.2', '7.3', '7.4']
 
     runs-on: ubuntu-latest
     name: PHPUnit - PHP ${{ matrix.php_versions }} - MySQL
@@ -38,7 +38,7 @@ jobs:
         php-version: ${{ matrix.php_versions }}
         extensions: mbstring, dom, fileinfo, gd, memcached, redis, pdo_sqlite
         coverage: xdebug
-        tools: pecl, composer:v1
+        tools: pecl, composer
 
     - uses: actions/setup-node@v2
       with:
@@ -109,7 +109,7 @@ jobs:
       strategy:
         fail-fast: false
         matrix:
-          php_versions: ['7.1', '7.2', '7.3', '7.4']
+          php_versions: ['7.2', '7.3', '7.4']
 
       runs-on: ubuntu-latest
       name: PHPUnit - PHP ${{ matrix.php_versions }} - SQLite
@@ -129,7 +129,7 @@ jobs:
           php-version: ${{ matrix.php_versions }}
           extensions: mbstring, dom, fileinfo, gd, memcached, redis, pdo_sqlite
           coverage: xdebug
-          tools: pecl, composer:v1
+          tools: pecl, composer
 
       - uses: actions/setup-node@v2
         with:
@@ -178,7 +178,7 @@ jobs:
       strategy:
         fail-fast: false
         matrix:
-          php_versions: ['7.1', '7.2', '7.3', '7.4']
+          php_versions: ['7.2', '7.3', '7.4']
 
       runs-on: ubuntu-latest
       name: PHPUnit - PHP ${{ matrix.php_versions }} - PostgreSQL
@@ -202,7 +202,7 @@ jobs:
           php-version: ${{ matrix.php_versions }}
           extensions: mbstring, dom, fileinfo, gd, memcached, redis, pdo_sqlite, pdo_pgsql
           coverage: xdebug
-          tools: pecl, composer:v1
+          tools: pecl, composer
 
       - name: Setup PostgreSQL
         uses: harmon758/postgresql-action@v1
@@ -253,7 +253,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php_versions: ['7.1', '7.2', '7.3', '7.4']
+        php_versions: ['7.2', '7.3', '7.4']
 
     runs-on: windows-latest
     name: PHPUnit - PHP ${{ matrix.php_versions }} - Windows
@@ -273,7 +273,7 @@ jobs:
         php-version: ${{ matrix.php_versions }}
         extensions: mbstring, dom, fileinfo, gd, pdo, sqlite, pdo_sqlite
         coverage: xdebug
-        tools: pecl, composer:v1
+        tools: pecl, composer
 
     - uses: actions/setup-node@v2
       with:
@@ -329,7 +329,7 @@ jobs:
         php-version: ${{ matrix.php_versions }}
         extensions: mbstring, dom, fileinfo, gd
         coverage: xdebug
-        tools: pecl, composer:v1
+        tools: pecl, composer
 
     - uses: actions/setup-node@v2
       with:

diff --git a/app/defines.php b/app/defines.php
@@ -13,8 +13,8 @@
 // Some standard defines
 define('UserFrosting\VERSION', '4.5.0-dev');
 define('UserFrosting\DS', '/');
-define('UserFrosting\PHP_MIN_VERSION', '7.1');
-define('UserFrosting\PHP_RECOMMENDED_VERSION', '7.3');
+define('UserFrosting\PHP_MIN_VERSION', '7.2');
+define('UserFrosting\PHP_RECOMMENDED_VERSION', '7.4');
 define('UserFrosting\NODE_MIN_VERSION', '^12.17.0 || >=14.0.0');
 define('UserFrosting\NPM_MIN_VERSION', '>=6.14.4');
 

diff --git a/composer.json b/composer.json
@@ -24,12 +24,12 @@
         "vendor-dir": "app/vendor"
     },
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.2",
         "ext-gd": "*",
         "composer/installers": "^1.4.0",
         "userfrosting/uniformresourcelocator": "~4.4.0",
         "symfony/console": "^4.3",
-        "wikimedia/composer-merge-plugin": "^1.4.0"
+        "wikimedia/composer-merge-plugin": "^2.1.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.13",