Merge branch 'master' into taint_analysis

Author: alies-dev

.github/workflows/test.yml

@@ -1,6 +1,7 @@
 name: Tests
 
 on:
+  workflow_dispatch:
   push:
     paths:
       - '**.php'
@@ -20,6 +21,7 @@ on:
 jobs:
 
   unit_tests:
+    name: Unit tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -53,7 +55,7 @@ jobs:
         exclude:
           - php: 8.0
             laravel: ^10.0
-    name: P${{ matrix.php }} | L${{ matrix.laravel }} | ${{ matrix.dependencies == 'highest' && '↑' || '↓' }}
+    name: Acceptance P${{ matrix.php }} | L${{ matrix.laravel }} | ${{ matrix.dependencies == 'highest' && '↑' || '↓' }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -62,8 +64,9 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
+          ini-values: opcache.enable_cli=1, opcache.jit=tracing, opcache.jit_buffer_size=256M
           coverage: none
-          tools: composer:v2
+          tools: composer
 
       - name: Install lowest dependencies from composer.json
         if: "matrix.dependencies == 'lowest'"

composer.json

@@ -13,18 +13,18 @@
     "require": {
         "php": "^8.0.2",
         "ext-simplexml": "*",
-        "barryvdh/laravel-ide-helper": "^2.12",
-        "illuminate/config": "^9.48 || ^10.0.0",
-        "illuminate/container": "^9.48 || ^10.0.0",
-        "illuminate/contracts": "^9.48 || ^10.0.0",
-        "illuminate/database": "^9.48 || ^10.0.0",
-        "illuminate/events": "^9.48 || ^10.0.0",
-        "illuminate/http": "^9.48 || ^10.0.0",
-        "illuminate/routing": "^9.48 || ^10.0.0",
-        "illuminate/support": "^9.48 || ^10.0.0",
-        "illuminate/view": "^9.48 || ^10.0.0",
+        "barryvdh/laravel-ide-helper": "^2.13",
+        "illuminate/config": "^9.48 || ^10.0",
+        "illuminate/container": "^9.48 || ^10.0",
+        "illuminate/contracts": "^9.48 || ^10.0",
+        "illuminate/database": "^9.48 || ^10.0",
+        "illuminate/events": "^9.48 || ^10.0",
+        "illuminate/http": "^9.48 || ^10.0",
+        "illuminate/routing": "^9.48 || ^10.0",
+        "illuminate/support": "^9.48 || ^10.0",
+        "illuminate/view": "^9.48 || ^10.0",
         "nikic/php-parser": "^4.13",
-        "orchestra/testbench": "^7.19 || ^8.0.0",
+        "orchestra/testbench": "^7.19 || ^8.0",
         "symfony/console": "^6.0",
         "vimeo/psalm": "^4.30 || ^5.1"
     },
@@ -34,7 +34,7 @@
         "codeception/module-cli": "^2.0",
         "codeception/module-filesystem": "^3.0",
         "codeception/module-phpbrowser": "^3.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6 || ^10.0",
         "ramsey/collection": "^1.3",
         "slevomat/coding-standard": "^8.8",
         "squizlabs/php_codesniffer": "*",

phpunit.xml

@@ -1,25 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         cacheResultFile=".phpunit.cache/test-results"
-         executionOrder="depends,defects"
-         forceCoversAnnotation="true"
-         beStrictAboutCoversAnnotation="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         convertDeprecationsToExceptions="true"
-         failOnRisky="true"
-         failOnWarning="true"
-         verbose="true">
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+    bootstrap="vendor/autoload.php"
+    executionOrder="depends,defects"
+    beStrictAboutOutputDuringTests="true"
+    failOnRisky="true"
+    failOnWarning="true"
+    cacheDirectory=".phpunit.cache"
+    requireCoverageMetadata="true"
+    beStrictAboutCoverageMetadata="true">
     <testsuites>
         <testsuite name="default">
             <directory>tests/Unit</directory>
         </testsuite>
     </testsuites>
-
-    <coverage cacheDirectory=".phpunit.cache/code-coverage"
-              processUncoveredFiles="true">
+    <coverage>
         <include>
             <directory suffix=".php">src</directory>
         </include>

src/Plugin.php

@@ -50,13 +50,23 @@ public function __invoke(RegistrationInterface $registration, ?SimpleXMLElement
     protected function getCommonStubs(): array
     {
         return array_merge(
+            glob(dirname(__DIR__) . '/stubs/Collections/*.stubphp'),
             glob(dirname(__DIR__) . '/stubs/Contracts/*.stubphp'),
             glob(dirname(__DIR__) . '/stubs/Database/*.stubphp'),
+            glob(dirname(__DIR__) . '/stubs/Foundation/*.stubphp'),
             glob(dirname(__DIR__) . '/stubs/Http/*.stubphp'),
+            glob(dirname(__DIR__) . '/stubs/legacy-factories/*.stubphp'),
             glob(dirname(__DIR__) . '/stubs/Lumen/*.stubphp'),
             glob(dirname(__DIR__) . '/stubs/Pagination/*.stubphp'),
             glob(dirname(__DIR__) . '/stubs/Support/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/*.stubphp')
+        );
+    }
+
+    /** @return array<array-key, string> */
+    protected function getTaintAnalysisStubs(): array
+    {
+        return array_merge(
+            glob(dirname(__DIR__) . '/stubs/TaintAnalysis/Http/*.stubphp'),
         );
     }
 
@@ -65,14 +75,18 @@ protected function getStubsForVersion(string $version): array
     {
         [$majorVersion] = explode('.', $version);
 
-        return glob(dirname(__DIR__) . '/stubs/' . $majorVersion . '/*.stubphp');
+        return array_merge(
+            glob(dirname(__DIR__) . '/stubs/' . $majorVersion . '/*.stubphp'),
+            glob(dirname(__DIR__) . '/stubs/' . $majorVersion . '/**/*.stubphp'),
+        );
     }
 
     private function registerStubs(RegistrationInterface $registration): void
     {
         $stubs = array_merge(
             $this->getCommonStubs(),
             $this->getStubsForVersion(Application::VERSION),
+            $this->getTaintAnalysisStubs(),
         );
 
         foreach ($stubs as $stubFilePath) {

stubs/9/Foundation/helpers.stubphp

@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Dispatch a command to its appropriate handler in the current process.
+ *
+ * @param  object|callable  $job
+ * @param  mixed  $handler
+ * @return mixed
+ *
+ * @deprecated Will be removed in a future Laravel version.
+ */
+function dispatch_now($job, $handler = null) {}

stubs/Collections/helpers.stubphp

@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * Stubs for {@see https://github.com/laravel/framework/blob/master/src/Illuminate/Collections/helpers.php}
+ */
+
+// collect: nothing to stub
+
+/**
+ * Fill in data where it's missing.
+ *
+ * @template TTarget
+ *
+ * @param  TTarget  $target
+ * @param  string|array  $key
+ * @param  mixed  $value
+ * @return mixed
+ * @psalm-return TTarget is array ? array : TTarget
+ */
+function data_fill(&$target, $key, $value) {}
+
+// data_get: nothing to stub
+
+/**
+ * Set an item on an array or object using dot notation.
+ *
+ * @template TTarget
+ *
+ * @param  TTarget  $target
+ * @param  string|array  $key
+ * @param  mixed  $value
+ * @param  bool  $overwrite
+ * @psalm-return TTarget is array ? array : TTarget
+ */
+function data_set(&$target, $key, $value, $overwrite = true) {}
+
+/**
+ * Get the first element of an array. Useful for method chaining.
+ *
+ * @template TValue
+ * @template TParam of TValue[]
+ * @param  TParam  $array
+ * @return (TParam is non-empty-array ? TValue : false)
+ */
+function head($array) {}
+
+/**
+ * Get the last element from an array.
+ *
+ * @template TValue
+ * @template TParam of TValue[]
+ *
+ * @param  TParam  $array
+ * @return (TParam is non-empty-array ? TValue : false)
+ */
+function last($array) {}
+
+/**
+ * Return the default value of the given value.
+ *
+ * @template TValue
+ * @template TClosureReturn
+ *
+ * @param  mixed|(Closure(): TClosureReturn)  $value
+ * @param  mixed  ...$args
+ * @return (TValue is Closure ? TClosureReturn : TValue)
+ */
+function value($value, ...$args) {}