Merge pull request #139 from wp-media/develop

2.3.8

.github/workflows/deploy-tag.yml

@@ -9,7 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
-    - name: build
+    - name: regular build
+      run: composer install --ignore-platform-reqs
+    - name: build without dev
       run: composer install --no-dev --no-scripts --ignore-platform-reqs
     - name: remove composer/installers
       run: composer remove composer/installers --update-no-dev --no-scripts --ignore-platform-reqs

.gitignore

@@ -1,3 +1,6 @@
-
 .DS_Store
-/vendor/
+/vendor/
+src/Dependencies
+.lando.yml
+package-lock.json
+.idea

assets/css/admin.css

@@ -100,7 +100,6 @@
 
 .rocket-lazyload-form legend {
 	display: block;
-	width: 100%;
 	padding: 19px 0 14px;
 	border-bottom: 1px solid #EEEEEE;
 	font-weight: 600;

composer.json

@@ -16,7 +16,11 @@
 	],
 	"type": "wordpress-plugin",
 	"config": {
-		"sort-packages": true
+		"sort-packages": true,
+		"allow-plugins": {
+			"composer/installers": true,
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	},
 	"support": {
 		"issues": "https://github.com/wp-media/rocket-lazy-load/issues",
@@ -34,18 +38,21 @@
         }
     },
 	"require": {
-		"php": ">=5.6",
-		"composer/installers": "~1.0",
-		"wp-media/rocket-lazyload-common": "^2.0"
+		"php": ">=7.3",
+		"composer/installers": "^1.0 || ^2.0"
 	},
 	"require-dev": {
-		"league/container": "^2.4",
+		"psr/container": "1.0.0",
 		"brain/monkey": "^2.0",
-		"coenjacobs/mozart": "^0.5.1",
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+		"coenjacobs/mozart": "^0.7.0",
+		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
 		"phpcompatibility/phpcompatibility-wp": "^2.0",
-		"phpunit/phpunit": "^5.7",
-		"wp-coding-standards/wpcs": "^2.0.0"
+		"phpunit/phpunit": "^7.5 || ^8 || ^9",
+		"wp-coding-standards/wpcs": "^2.0.0",
+		"wp-launchpad/core": "^0.2.6",
+		"wp-launchpad/framework-options": "^0.1.3",
+		"wp-media/phpunit": "^3.0",
+		"wp-media/rocket-lazyload-common": "^3.0"
 	},
 	"extra": {
 		"mozart": {
@@ -55,7 +62,9 @@
 			"classmap_prefix": "RLLP_",
 			"packages": [
 				"wp-media/rocket-lazyload-common",
-				"league/container"
+				"league/container",
+				"wp-launchpad/core",
+				"wp-launchpad/framework-options"
 			],
 			"delete_vendor_directories": true
 		}
@@ -64,12 +73,12 @@
         "test-unit":"\"vendor/bin/phpunit\" --testsuite unit --colors=always",
 		"test-integration": "\"vendor/bin/phpunit\" --testsuite integration --colors=always --configuration tests/Integration/phpunit.xml.dist",
 		"post-install-cmd": [
-			"[ $COMPOSER_DEV_MODE -eq 0 ] || \"vendor/bin/mozart\" compose",
+			"\"vendor/bin/mozart\" compose",
 			"composer dump-autoload"
 		],
 		"post-update-cmd": [
-			"[ $COMPOSER_DEV_MODE -eq 0 ] || \"vendor/bin/mozart\" compose",
+			"\"vendor/bin/mozart\" compose",
 			"composer dump-autoload"
 		]
-    }
+	}
 }