Fixing errors and such so Actions runs work (#2)

* removing prefer-lowest for now, removing php 8 function for preg errors * fixing phpstan error for php 8, adding php 7.1 to mix to see if we can keep that minimum * removing php 7.1 from matrix and bumping minimum to 7.2 * bumping actions/cache version * fixing wrong URL in badges
diablomedia · Apr 16, 2021 · 49483db · 49483db
1 parent 7fbec32
commit 49483db
Show file tree

Hide file tree

Showing 6 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:
             matrix:
                 operating-system: [ubuntu-latest]
                 php-versions: ['7.2', '7.3', '7.4', '8.0']
-                composer-args: ['', '--prefer-lowest']
+                composer-args: ['']
         runs-on: ${{ matrix.operating-system }}
         steps:
             - name: Checkout
@@ -29,7 +29,7 @@ jobs:
               id: composer-cache
               run: echo "::set-output name=dir::$(composer config cache-files-dir)"
             - name: Cache dependencies
-              uses: actions/cache@v2.1.4
+              uses: actions/cache@v2.1.5
               with:
                   path: ${{ steps.composer-cache.outputs.dir }}
                   key: php${{ matrix.php-versions }}-composer-${{ matrix.composer-args }}-${{ hashFiles('**/composer.json') }}

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Doctrine1 Bundle
 
-[![Build](https://github.com/diablomedia/zf1-acl/workflows/Build/badge.svg?event=push)](https://github.com/diablomedia/zf1-acl/actions?query=workflow%3ABuild+event%3Apush)
+[![Build](https://github.com/diablomedia/doctrine1-bundle/workflows/Build/badge.svg?event=push)](https://github.com/diablomedia/doctrine1-bundle/actions?query=workflow%3ABuild+event%3Apush)
 [![Latest Stable Version](https://poser.pugx.org/diablomedia/doctrine1-bundle/v/stable)](https://packagist.org/packages/diablomedia/doctrine1-bundle)
 [![Total Downloads](https://poser.pugx.org/diablomedia/doctrine1-bundle/downloads)](https://packagist.org/packages/diablomedia/doctrine1-bundle)
 [![License](https://poser.pugx.org/diablomedia/doctrine1-bundle/license)](https://packagist.org/packages/diablomedia/doctrine1-bundle)

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^7.1 || ^8.0",
+        "php": "^7.2 || ^8.0",
         "doctrine/doctrine1": "^1.2.0",
         "jdorn/sql-formatter": "^1.2.16",
         "symfony/cache": "^4.3.3|^5.0",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -40,11 +40,6 @@ parameters:
 			count: 1
 			path: src/DependencyInjection/Configuration.php
 
-		-
-			message: "#^Parameter \\#2 \\$search of function array_key_exists expects array, array\\<Symfony\\\\Component\\\\VarDumper\\\\Cloner\\\\Data\\>\\|bool\\|float\\|int\\|string\\|null given\\.$#"
-			count: 4
-			path: src/Twig/Doctrine1Extension.php
-
 		-
 			message: "#^Strict comparison using \\=\\=\\= between string and false will always evaluate to false\\.$#"
 			count: 1

diff --git a/phpstan.neon b/phpstan.neon
@@ -3,5 +3,10 @@ parameters:
     level: 8
     paths:
         - src
+    ignoreErrors:
+        -
+            message: "#^Parameter \\#2 \\$(search|array) of function array_key_exists expects array, array\\<Symfony\\\\Component\\\\VarDumper\\\\Cloner\\\\Data\\>\\|bool\\|float\\|int\\|string\\|null given\\.$#"
+            count: 4
+            path: src/Twig/Doctrine1Extension.php
 includes:
-	- phpstan-baseline.neon
+    - phpstan-baseline.neon
diff --git a/src/Twig/Doctrine1Extension.php b/src/Twig/Doctrine1Extension.php
@@ -102,13 +102,13 @@ public function formatQuery(string $sql, bool $highlightOnly = false): string
             $html = SqlFormatter::highlight($sql);
             $html = preg_replace('/<pre class=".*">([^"]*+)<\/pre>/Us', '\1', $html);
             if ($html === null) {
-                throw new \RuntimeException('Error replacing: ' . preg_last_error_msg());
+                throw new \RuntimeException('Error in preg_replace call');
             }
         } else {
             $html = SqlFormatter::format($sql);
             $html = preg_replace('/<pre class="(.*)">([^"]*+)<\/pre>/Us', '<div class="\1"><pre>\2</pre></div>', $html);
             if ($html === null) {
-                throw new \RuntimeException('Error replacing: ' . preg_last_error_msg());
+                throw new \RuntimeException('Error in preg_replace call');
             }
         }
 
@@ -172,7 +172,7 @@ static function (array $matches) use ($parameters, &$i): string {
         );
 
         if ($query === null) {
-            throw new \RuntimeException('Error replacing: ' . preg_last_error_msg());
+            throw new \RuntimeException('Error in preg_replace_callback call');
         }
 
         return $query;