fix: fix required dependencies (#112)

monicahq · Jan 14, 2022 · 2149c91 · 2149c91
1 parent a865906
commit 2149c91
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -72,7 +72,7 @@ jobs:
       - name: Install dependencies with Laravel ${{ matrix.laravel_version }}
         run: |
           export COMPOSER_ROOT_VERSION=dev-master
-          composer require "laravel/framework:${{ matrix.laravel_version }}" --no-interaction --no-progress --prefer-stable --prefer-dist
+          composer require "illuminate/console:${{ matrix.laravel_version }}" "illuminate/http:${{ matrix.laravel_version }}" "illuminate/routing:${{ matrix.laravel_version }}" "illuminate/support:${{ matrix.laravel_version }}" --no-interaction --no-progress --prefer-stable --prefer-dist
 
       - name: Run test suite
         run: phpdbg -dmemory_limit=4G -qrr vendor/bin/phpunit -c phpunit.xml --log-junit ./results/results.xml --coverage-clover ./results/coverage.xml

diff --git a/composer.json b/composer.json
@@ -20,18 +20,22 @@
         }
     ],
     "require": {
-        "laravel/framework": "^5.6 || ^6.0 || ^7.0 || ^8.0",
+        "illuminate/contracts": "^5.6 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "illuminate/http": "^5.6 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "illuminate/routing": "^5.6 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "illuminate/support": "^5.6 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
         "sabre/dav": "^4.0",
         "thecodingmachine/safe": "^1.0"
     },
     "require-dev": {
+        "laravel/framework": "^5.6 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
         "mockery/mockery": "^1.4",
-        "nunomaduro/larastan": "^0.4 || ^0.5 || ^0.6 || ^0.7",
+        "nunomaduro/larastan": "^0 || ^1.0",
         "ocramius/package-versions": "^1.9 || ^2.0",
         "orchestra/testbench": "^3.5 || ^5.0 || ^6.0 || ^7.0",
-        "phpstan/phpstan-deprecation-rules": "^0.12",
-        "phpstan/phpstan-phpunit": "^0.12",
-        "phpstan/phpstan-strict-rules": "^0.12",
+        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "phpstan/phpstan-phpunit": "^1.0",
+        "phpstan/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0",
         "thecodingmachine/phpstan-safe-rule": "^1.0",
         "vimeo/psalm": "^3.0 || ^4.0"

diff --git a/src/LaravelSabre.php b/src/LaravelSabre.php
@@ -10,14 +10,14 @@ final class LaravelSabre
     /**
      * The collection of node to use with the sabre server.
      *
-     * @var array|\Sabre\DAV\Tree|\Sabre\DAV\INode|\Closure
+     * @var array|\Sabre\DAV\Tree|\Sabre\DAV\INode|\Closure|null
      */
     private static $nodes;
 
     /**
      * The collection of plugins to register to the sabre server.
      *
-     * @var array|\Closure
+     * @var array|\Closure|null
      */
     private static $plugins = [];
 
@@ -31,7 +31,7 @@ final class LaravelSabre
     /**
      * Returns list of nodes to create the sabre collection.
      *
-     * @return array|\Sabre\DAV\Tree|\Sabre\DAV\INode
+     * @return array|\Sabre\DAV\Tree|\Sabre\DAV\INode|null
      */
     public static function getNodes()
     {
@@ -64,7 +64,7 @@ public static function nodes($nodes)
     /**
      * Return the list of plugins to add to the sabre server.
      *
-     * @return array
+     * @return array|null
      */
     public static function getPlugins()
     {