Merge pull request #291 from 10up/upkeep/php-reqs

upkeep/php-reqs: Update PHP compat check to prevent fatal error

.github/workflows/build-and-tag.yml

@@ -10,7 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Install Composer dependencies
+        run: composer install --no-dev
 
       - name: Install Dependencies
         run: npm install

.github/workflows/build-release-zip.yml

@@ -13,21 +13,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Cache node_modules
         id: cache-node-modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
           path: node_modules
           key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
 
       - name: Setup node version and npm cache
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
+      - name: Install Composer dependencies
+        run: composer install --no-dev
+
       - name: Install Node dependencies
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: npm install

.github/workflows/push-asset-readme-update.yml

@@ -12,8 +12,9 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-
-      - name: Setup node version
+      - name: Install Composer dependencies
+        run: composer install --no-dev
+      - name: Install node
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'

.gitignore

@@ -4,6 +4,7 @@ bower_components
 languages
 release
 vendor
+10up-lib
 composer.lock
 phpunit.xml
 .idea

composer.json

@@ -1,44 +1,63 @@
 {
-  "name": "10up/simple-local-avatars",
-  "description": "Adds an avatar upload field to user profiles. Generates requested sizes on demand just like Gravatar!",
-  "type": "wordpress-plugin",
-  "keywords": [
-    "wordpress",
-    "10up"
-  ],
-  "homepage": "https://github.com/10up/simple-local-avatars",
-  "license": ["GPL-2.0-or-later"],
-  "authors": [
-    {
-      "name": "10up",
-      "homepage": "https://10up.com/"
-    }
-  ],
-  "support": {
-    "issues": "https://github.com/10up/simple-local-avatars/issues",
-    "source": "https://github.com/10up/simple-local-avatars"
-  },
-  "require": {
-    "php": ">=7.4"
-  },
-  "require-dev": {
-    "10up/phpcs-composer": "dev-master",
-    "10up/wp_mock": "0.4.2",
-    "yoast/phpunit-polyfills": "^1.0"
-  },
-  "scripts": {
-    "lint": [
-      "phpcs . --runtime-set testVersion 7.4-"
-    ],
-    "lint-fix": [
-      "phpcbf ."
-    ],
-    "phpcs:compat": "vendor/bin/phpcs simple-local-avatars.php includes --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 7.4-"
-  },
-  "minimum-stability": "dev",
-  "config": {
-    "allow-plugins": {
-      "dealerdirect/phpcodesniffer-composer-installer": true
-    }
-  }
+	"name": "10up/simple-local-avatars",
+	"description": "Adds an avatar upload field to user profiles. Generates requested sizes on demand just like Gravatar!",
+	"type": "wordpress-plugin",
+	"keywords": [
+		"wordpress",
+		"10up"
+	],
+	"homepage": "https://github.com/10up/simple-local-avatars",
+	"license": ["GPL-2.0-or-later"],
+	"authors": [
+		{
+			"name": "10up",
+			"homepage": "https://10up.com/"
+		}
+	],
+	"support": {
+		"issues": "https://github.com/10up/simple-local-avatars/issues",
+		"source": "https://github.com/10up/simple-local-avatars"
+	},
+	"require": {
+		"php": ">=7.4",
+		"10up/wp-compat-validation-tool": "dev-trunk"
+	},
+	"require-dev": {
+		"10up/phpcs-composer": "dev-master",
+		"10up/wp_mock": "0.4.2",
+		"yoast/phpunit-polyfills": "^1.0"
+	},
+	"scripts": {
+		"lint": [
+			"phpcs . --runtime-set testVersion 7.4-"
+		],
+		"lint-fix": [
+			"phpcbf ."
+		],
+		"phpcs:compat": "vendor/bin/phpcs simple-local-avatars.php includes --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 7.4-",
+		"post-install-cmd": [
+			"./10up-lib/wp-compat-validation-tool/replace-namespace.sh SimpleLocalAvatarsValidator"
+		],
+		"post-update-cmd": [
+			"./10up-lib/wp-compat-validation-tool/replace-namespace.sh SimpleLocalAvatarsValidator"
+		]
+	},
+	"minimum-stability": "dev",
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true,
+			"composer/installers": true
+		}
+	},
+	"repositories": [
+		{
+			"type": "git",
+			"url": "https://github.com/10up/wp-compat-validation-tool.git"
+		}
+	],
+	"extra": {
+		"installer-paths": {
+			"./{$name}/": ["10up/wp-compat-validation-tool"]
+		}
+	}
 }