Merge branch '1.9.4.x' into _filterStoreCondition

OpenMage · Aug 9, 2022 · 2da8d6b · 2da8d6b
2 parents c54729a + f1b41d3
commit 2da8d6b
Show file tree

Hide file tree

Showing 8,428 changed files with 9,406 additions and 60,786 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -1342,6 +1342,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "discountscott",
+      "name": "Scott Moore",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5454596?v=4",
+      "profile": "https://github.com/discountscott",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -4,6 +4,11 @@
   - .phpstorm.meta.php/*
   - .travis.yml
 
+'phpstan':
+  - .github/phpstan.neon
+  - .github/phpstan-baseline.neon
+  - .github/phpstan_experimental_level.neon
+
 'htaccess':
   - .htaccess