Merge pull request #147 from rtCamp/feat/add-phpcs-new-changes

Feat: Add phpcs fixes and Update composer.json and vendor files

.github/workflows/phpunit_on_pull_request.yml

@@ -48,9 +48,13 @@ jobs:
         if: steps.check_files.outputs.files_exists == 'true'
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
+      - name: Update composer packages
+        if: steps.check_files.outputs.files_exists == 'true'
+        run: composer update
+
       - name: Run PHPUnit
         if: steps.check_files.outputs.files_exists == 'true'
-        run: composer update && composer tests:unit
+        run: vendor/bin/phpunit tests/php/Unit/ --verbose
 
       - name: Archive code coverage results
         uses: actions/upload-artifact@v2

.gitignore

@@ -2,3 +2,6 @@
 node_modules/
 .DS_Store
 .phpunit.result.cache
+
+# Configs
+/phpcs.xml

composer.json

@@ -1,67 +1,54 @@
 {
-    "name": "rtcamp/login-with-google",
-    "description": "WordPress plugin to let users login with google.",
-    "license": "GPL 2.0",
-    "authors": [
-        {
-            "name": "rtCamp",
-            "email": "[email protected]",
-            "homepage": "https://rtcamp.com/",
-            "role": "Developer"
-        },
-        {
-            "name": "Utkarsh Patel",
-            "email": "[email protected]"
-        },
-        {
-            "name": "Paul Clark",
-            "role": "Developer"
-        },
-        {
-            "name": "Ankit Gade",
-            "email": "[email protected]",
-            "homepage": "https://iamank.it/",
-            "role": "Developer"
-        }
-    ],
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "require": {
-        "php": ">=7.1",
-        "pimple/pimple": "3.3.*"
-    },
-    "require-dev": {
-        "squizlabs/php_codesniffer": "^3.7.1",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
-        "wp-coding-standards/wpcs": "^2.3",
-        "sirbrillig/phpcs-variable-analysis": "^v2.11.3",
-        "automattic/vipwpcs": "^2.3.3",
-        "phpcompatibility/phpcompatibility-wp": "^2.1.3",
-        "phpunit/phpunit": "9.5",
-        "10up/wp_mock": "0.4.2"
-    },
-    "config": {
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true
-        }
-    },
-    "autoload": {
-        "psr-4": {
-            "RtCamp\\GoogleLogin\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "RtCamp\\GoogleLogin\\Tests\\": "tests/php"
-        }
-    },
-    "scripts": {
-        "cs": "@php ./vendor/bin/phpcs",
-        "cs:fix": "@php ./vendor/bin/phpcbf",
-        "tests:unit": "@php ./vendor/bin/phpunit tests/php/Unit/",
-        "qa": [
-            "@cs",
-            "@tests"
-        ]
-    }
+	"name": "rtcamp/login-with-google",
+	"description": "WordPress plugin to let users login with google.",
+	"license": "GPL-2.0-or-later",
+	"type": "wordpress-plugin",
+	"homepage": "https://github.com/rtCamp/login-with-google",
+	"require": {
+		"php": ">=7.1",
+		"pimple/pimple": "3.3.*"
+	},
+	"require-dev": {
+		"10up/wp_mock": "^0.4.2",
+		"automattic/vipwpcs": "^2.3",
+		"civicrm/composer-downloads-plugin": "^3.0",
+		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
+		"php-stubs/wordpress-stubs": "^6.0",
+		"phpcompatibility/phpcompatibility-wp": "^2.1",
+		"phpunit/phpunit": "^9.5",
+		"roave/security-advisories": "dev-latest",
+		"sirbrillig/phpcs-variable-analysis": "^2.11",
+		"wp-coding-standards/wpcs": "^2.3"
+	},
+	"minimum-stability": "dev",
+	"prefer-stable": true,
+	"autoload": {
+		"psr-4": {
+			"RtCamp\\GoogleLogin\\": "src/"
+		}
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"RtCamp\\GoogleLogin\\Tests\\": "tests/php"
+		}
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true,
+			"civicrm/composer-downloads-plugin": true
+		},
+		"sort-packages": true
+	},
+	"extra": {
+		"downloads": {
+			"phpstan": {
+				"path": "vendor/bin/phpstan",
+				"type": "phar",
+				"url": "https://github.com/phpstan/phpstan/releases/latest/download/phpstan.phar"
+			}
+		}
+	},
+	"scripts": {
+		"analyze": "if [ -z $TEST_SKIP_PHPSTAN ]; then phpstan --version; phpstan analyze --ansi --memory-limit=2G; fi"
+	}
 }