Merge pull request #69 from scoutapp/update-scout-5-2

Updated to use scout-apm-php ^5.3

.github/workflows/build.yml

@@ -94,13 +94,12 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           tools: pecl
           extensions: ${{ matrix.extensions }}
-      - name: "Install latest dependencies this platform can run with"
-        run: "composer update --prefer-dist --no-interaction --no-progress --no-suggest"
-      - name: "Downgrade to lowest versions" # Otherwise composer can't seem to work out dependencies
-        if: ${{ matrix.laravel-version == '5.5.*' }}
-        run: "composer update --prefer-lowest --prefer-dist --no-interaction --no-progress --no-suggest"
-      - name: "Install specific Laravel version ${{ matrix.laravel-version}}"
-        run: "composer require laravel/framework:${{ matrix.laravel-version}} --update-with-all-dependencies --no-interaction --no-progress --no-suggest --prefer-dist --prefer-stable"
+      # --no-update then a full `composer update` is needed to overcome locked dependencies
+      # See: https://github.com/composer/composer/issues/9561
+      - name: "Require specific Laravel version ${{ matrix.laravel-version}}"
+        run: "composer require laravel/framework:${{ matrix.laravel-version}} --no-update --no-interaction --prefer-dist --prefer-stable"
+      - name: "Composer update with new requirements"
+        run: "composer update --no-interaction --prefer-dist --prefer-stable"
       - name: "Run PHPUnit test suite"
         run: "vendor/bin/phpunit"
 

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.8.0 - 2020-12-15
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#69](https://github.com/scoutapp/scout-apm-laravel/pull/69) Updated to `scout-apm-php` ^5.3.0
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 1.7.0 - 2020-11-10
 
 ### Added

composer.json

@@ -19,7 +19,7 @@
         "illuminate/view": "^5.5.0|^6.0|^7.0|^8.0",
         "psr/log": "^1.0",
         "ramsey/uuid": "^3.0|^4.0",
-        "scoutapp/scout-apm-php": "^5.1"
+        "scoutapp/scout-apm-php": "^5.3.0"
     },
     "require-dev": {
         "doctrine/coding-standard": "^6.0",

tests/Unit/Providers/ScoutApmServiceProviderTest.php

@@ -37,6 +37,7 @@
 use Scoutapm\Connector\Connector;
 use Scoutapm\Events\Metadata;
 use Scoutapm\Extension\PotentiallyAvailableExtensionCapabilities;
+use Scoutapm\Extension\Version;
 use Scoutapm\Laravel\Middleware\ActionInstrument;
 use Scoutapm\Laravel\Middleware\IgnoredEndpoints;
 use Scoutapm\Laravel\Middleware\MiddlewareInstrument;
@@ -130,6 +131,13 @@ public function testScoutAgentUsesLaravelCacheWhenConfigured() : void
      */
     public function testScoutAgentUsesDevNullCacheWhenNoCacheIsConfigured() : void
     {
+        $laravelVersion = Version::fromString(Application::VERSION);
+        if (! $laravelVersion->isOlderThan(Version::fromString('8.0.0'))) {
+            self::markTestSkipped('Laravel 8 always seems to configure a cache now');
+
+            return;
+        }
+
         $this->serviceProvider->register();
         $agent = $this->application->make(ScoutApmAgent::class);