Merge pull request #97 from greg0ire/drop-php-71

Drop support for PHP 7.1

Author: greg0ire

.gitattributes

@@ -9,4 +9,3 @@
 /phpunit.xml.dist export-ignore
 /psalm.xml export-ignore
 /tests export-ignore
-/vendor-bin export-ignore

.github/workflows/continuous-integration.yml

@@ -21,7 +21,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.1"
           - "7.2"
           - "7.3"
           - "7.4"
@@ -40,13 +39,10 @@ jobs:
           tools: "cs2pr"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "highest"
 
-      - name: "Install phpunit with composer"
-        run: "composer bin phpunit install --no-interaction --no-progress --no-suggest"
-
       - name: "Test fixes"
         run: "vendor/bin/phpunit --coverage-text"
 
@@ -72,16 +68,10 @@ jobs:
           tools: "cs2pr"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "highest"
 
-      - name: "Install phpunit with composer"
-        run: "composer bin phpunit install --no-interaction --no-progress --no-suggest"
-
-      - name: "Install phpstan with composer"
-        run: "composer bin phpstan install --no-interaction --no-progress --no-suggest"
-
       - name: "Run a static analysis with phpstan/phpstan"
         run: "vendor/bin/phpstan analyse --error-format=checkstyle | cs2pr"
 
@@ -106,16 +96,10 @@ jobs:
           php-version: "${{ matrix.php-version }}"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "highest"
 
-      - name: "Install phpunit with composer"
-        run: "composer bin phpunit install --no-interaction --no-progress --no-suggest"
-
-      - name: "Install psalm with composer"
-        run: "composer bin all install --no-interaction --no-progress --no-suggest"
-
       - name: "Run a static analysis with vimeo/psalm"
         run: "vendor/bin/psalm --show-info=false --stats --output-format=github --threads=4"
 
@@ -139,18 +123,10 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           tools: "cs2pr"
 
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v1"
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v3"
         with:
-          path: "~/.composer/cache"
-          key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}-${{ hashFiles('vendor-bin/*/composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
-
-      - name: "Install dependencies with composer"
-        run: "composer install --no-interaction --no-progress --no-suggest"
-
-      - name: "Install phpcs with composer"
-        run: "composer bin all install --no-interaction --no-progress --no-suggest"
+          dependency-versions: "highest"
 
       # Remove -q when updating to phpcs v4
       - name: "Run squizlabs/php_codesniffer"

.gitignore

@@ -1,5 +1,4 @@
 /.phpunit.result.cache
 /.phpcs-cache
 vendor/
-vendor-bin/**/vendor
-vendor-bin/phpunit/composer.lock
+/composer.lock

CONTRIBUTING.md

@@ -8,7 +8,6 @@ Make sure you read our [contributing guide][contributing guide on the website].
 
 ```shell
 composer install
-composer bin all install
 ```
 
 ## Running checks locally

composer.json

@@ -6,10 +6,13 @@
     "license": "MIT",
     "type": "library",
     "require": {
-        "php": "^7.1 || ^8.0"
+        "php": "^7.2 || ^8.0"
     },
     "require-dev": {
-        "bamarni/composer-bin-plugin": "^1.4"
+        "doctrine/coding-standard": "^9.0",
+        "phpstan/phpstan": "^1.0",
+        "phpunit/phpunit": "^8.5 || ^9.6",
+        "vimeo/psalm": "^4.11"
     },
     "authors": [
         {
@@ -29,12 +32,9 @@
         }
     },
     "config": {
-        "allow-plugins": {
-            "bamarni/composer-bin-plugin": true
-        },
         "sort-packages": true,
-        "platform": {
-            "php": "7.1.0"
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },
     "bin": ["bin/sql-formatter"]

examples/cli.php

@@ -28,4 +28,6 @@
 use Doctrine\SqlFormatter\SqlFormatter;
 use Doctrine\SqlFormatter\Tokenizer;
 
+assert($sql !== false);
+
 echo (new SqlFormatter())->format($sql);

phpstan.neon.dist

@@ -4,5 +4,3 @@ parameters:
         - %currentWorkingDirectory%/src
         - %currentWorkingDirectory%/tests
         - %currentWorkingDirectory%/examples
-    bootstrapFiles:
-        - %currentWorkingDirectory%/vendor-bin/phpunit/vendor/autoload.php

psalm.xml

@@ -5,7 +5,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    autoloader="tests/psalm-autoloader.php"
 >
     <projectFiles>
         <directory name="examples" />