diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9624293c3..06f03fa76 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: max-parallel: 6 matrix: operatingSystem: [ubuntu-latest, windows-latest] - phpVersion: ['8.1', '8.2', '8.3', '8.4'] + phpVersion: ['8.1', '8.2', '8.3', '8.4', '8.5'] fail-fast: false runs-on: ${{ matrix.operatingSystem }} name: ${{ matrix.operatingSystem }} / PHP ${{ matrix.phpVersion }} diff --git a/src/Config/Repository.php b/src/Config/Repository.php index 5ab39dbd2..e59f72f6e 100644 --- a/src/Config/Repository.php +++ b/src/Config/Repository.php @@ -194,7 +194,7 @@ protected function load($group, $namespace, $collection) // If we've already loaded this collection, we will just bail out since we do // not want to load it again. Once items are loaded a first time they will // stay kept in memory within this class and not loaded from disk again. - if (isset($this->afterLoad[$namespace])) { + if ($namespace !== null && isset($this->afterLoad[$namespace])) { $items = $this->callAfterLoad($namespace, $group, $items); } diff --git a/src/Console/Traits/ProcessesQuery.php b/src/Console/Traits/ProcessesQuery.php index 19d88d758..06cbc1d21 100644 --- a/src/Console/Traits/ProcessesQuery.php +++ b/src/Console/Traits/ProcessesQuery.php @@ -16,7 +16,7 @@ trait ProcessesQuery * query by the provided chunkSize, running the callback on each record and * limiting number of records processed to the provided limit */ - public function processQuery(Builder $query, callable $callback, int $chunkSize = 100, int $limit = null): void + public function processQuery(Builder $query, callable $callback, int $chunkSize = 100, ?int $limit = null): void { $totalRecords = $query->count(); diff --git a/src/Network/Http.php b/src/Network/Http.php index cca7a97c2..0f38a7659 100644 --- a/src/Network/Http.php +++ b/src/Network/Http.php @@ -368,7 +368,7 @@ public function send() /* * Close resources */ - curl_close($curl); + unset($curl); if ($this->streamFile) { rewind($headerStream);