feat: adding Laravel 11 support + pest [v4.1.0]

.github/workflows/run-tests.yml

@@ -10,40 +10,42 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        php: [8.1]
-        laravel: [10.*]
+        php: [8.1, 8.2, 8.3, 8.4]
+        laravel: [10.*, 11.*]
         exclude:
           - php: 8.1
-            laravel: 10.*
+            laravel: 11.*
         include:
           - laravel: 10.*
             testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
     steps:
-      -   name: Checkout code
-          uses: actions/checkout@v2
-
-      -   name: Cache dependencies
-          uses: actions/cache@v2
-          with:
-            path: ~/.composer/cache/files
-            key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
-
-      -   name: Setup PHP
-          uses: shivammathur/setup-php@v2
-          with:
-            php-version: ${{ matrix.php }}
-            extensions: dom, curl, libxml, mbstring, zip
-            coverage: none
-
-      -   name: Install dependencies
-          run: |
-            composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-            composer update --prefer-dist --no-interaction --no-progress
-
-      -   name: Execute tests
-          run: vendor/bin/phpunit
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.composer/cache/files
+          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --prefer-dist --no-interaction --no-progress
+
+      - name: Execute tests
+        run: vendor/bin/pest

README.md

@@ -15,6 +15,12 @@ You can install the package via composer:
 composer require pod-point/laravel-configcat
 ```
 
+For Laravel 5.4 up to 9.x
+
+```bash
+composer require pod-point/laravel-configcat:^3.0
+```
+
 ### Publishing the config file
 
 Next, you should publish the Laravel package configuration file using the `vendor:publish` Artisan command. It will be placed in your application's config directory:
@@ -71,12 +77,12 @@ Validator::make([
 ]);
 ```
 
-- When the feature flag is **on**
-  - The `email` will be a required field
-  - The `username` will be an optional field
-- When the feature flag is **off**, undefined, a text or number setting
-  - The `email` will be an optional field
-  - The `username` will be a required field
+-   When the feature flag is **on**
+    -   The `email` will be a required field
+    -   The `username` will be an optional field
+-   When the feature flag is **off**, undefined, a text or number setting
+    -   The `email` will be an optional field
+    -   The `username` will be a required field
 
 ### HTTP middleware
 
@@ -244,10 +250,10 @@ Please see [CONTRIBUTING](https://github.com/Pod-Point/laravel-configcat/blob/ma
 
 ## Credits
 
-- [configcat/php-sdk](https://github.com/configcat/php-sdk)
-- [ylsideas/feature-flags](https://github.com/ylsideas/feature-flags) for inspiration
-- [Pod Point](https://github.com/pod-point)
-- [All Contributors](https://github.com/pod-point/laravel-configcat/graphs/contributors)
+-   [configcat/php-sdk](https://github.com/configcat/php-sdk)
+-   [ylsideas/feature-flags](https://github.com/ylsideas/feature-flags) for inspiration
+-   [Pod Point](https://github.com/pod-point)
+-   [All Contributors](https://github.com/pod-point/laravel-configcat/graphs/contributors)
 
 ## License
 

composer.json

@@ -17,13 +17,13 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
+        "php": "^8.1",
         "configcat/configcat-client": "^9.0",
-        "illuminate/contracts": "^10.0"
+        "illuminate/contracts": "^10.0|^11.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^8.0",
-        "phpunit/phpunit": "^9.6",
+        "orchestra/testbench": "^8.0|^9.0",
+        "pestphp/pest": "^2.28",
         "mockery/mockery": "^1.6.7"
     },
     "autoload": {
@@ -50,15 +50,15 @@
         }
     },
     "scripts": {
-        "test": "vendor/bin/phpunit --colors=always",
-        "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
+        "test": "vendor/bin/pest"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "kylekatarnls/update-helper": true
+            "kylekatarnls/update-helper": true,
+            "pestphp/pest-plugin": true
         }
     }
 }

phpunit.xml.dist

@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
->
-    <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
-            <exclude>./tests/resources</exclude>
-        </testsuite>
-    </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" beStrictAboutTestsThatDoNotTestAnything="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Package Test Suite">
+      <directory suffix=".php">./tests/</directory>
+      <exclude>./tests/resources</exclude>
+    </testsuite>
+  </testsuites>
 </phpunit>

src/Facades/ConfigCat.php

@@ -46,7 +46,7 @@ public static function fake(array $flagsToFake = []): ConfigCatFake
         return $fake;
     }
 
-    protected static function isFake(): bool
+    public static function isFake(): bool
     {
         $name = static::getFacadeAccessor();
 

tests/Feature/BladeDirectivesTest.php

@@ -1,112 +1,99 @@
 <?php
 
-namespace PodPoint\ConfigCat\Tests\Feature;
-
 use Illuminate\Support\Facades\Route;
 use PodPoint\ConfigCat\Facades\ConfigCat;
-use PodPoint\ConfigCat\Tests\TestCase;
-
-class BladeDirectivesTest extends TestCase
-{
-    public function test_it_will_render_something_only_when_the_corresponding_feature_flag_is_enabled()
-    {
-        ConfigCat::fake([
-            'enabled_feature' => true,
-            'disabled_feature' => false,
-        ]);
-
-        Route::get('/foo', function () {
-            return view('feature');
-        });
-
-        $this->get('/foo')->assertDontSee('I am hidden');
-    }
-
-    public function test_it_will_consider_an_unknown_feature_flag_to_be_disabled()
-    {
-        ConfigCat::fake([
-            'enabled_feature' => true,
-            'disabled_feature' => false,
-        ]);
-
-        Route::get('/foo', function () {
-            return view('feature');
-        });
-
-        $this->get('/foo')->assertSee('You can see me');
-    }
-
-    public function test_it_will_consider_a_feature_flag_as_a_number_setting_to_be_disabled()
-    {
-        ConfigCat::fake([
-            'enabled_feature' => 1234,
-            'disabled_feature' => false,
-        ]);
-
-        Route::get('/foo', function () {
-            return view('feature');
-        });
-
-        $this->get('/foo')->assertDontSee('I should be visible');
-        $this->get('/foo')->assertSee('I should not be visible');
-    }
-
-    public function test_it_will_consider_a_feature_flag_as_a_text_setting_to_be_disabled()
-    {
-        ConfigCat::fake([
-            'enabled_feature' => 'foobar',
-            'disabled_feature' => false,
-        ]);
-
-        Route::get('/foo', function () {
-            return view('feature');
-        });
-
-        $this->get('/foo')->assertDontSee('I should be visible');
-        $this->get('/foo')->assertSee('I should not be visible');
-    }
-
-    public function test_it_supports_the_unlessconfigcat_directive()
-    {
-        ConfigCat::fake([
-            'enabled_feature' => true,
-            'disabled_feature' => false,
-        ]);
-
-        Route::get('/foo', function () {
-            return view('feature');
-        });
-
-        $this->get('/foo')->assertSee('I am not hidden');
-    }
-
-    public function test_it_supports_the_else_directive()
-    {
-        ConfigCat::fake([
-            'enabled_feature' => false,
-            'disabled_feature' => false,
-        ]);
-
-        Route::get('/foo', function () {
-            return view('feature');
-        });
-
-        $this->get('/foo')->assertDontSee('I should be visible');
-        $this->get('/foo')->assertSee('I should not be visible');
-    }
-
-    public function test_it_supports_the_elseconfigcat_directive()
-    {
-        ConfigCat::fake([
-            'enabled_feature' => true,
-            'disabled_feature' => false,
-        ]);
-
-        Route::get('/foo', function () {
-            return view('feature');
-        });
-
-        $this->get('/foo')->assertDontSee('You cannot see me');
-        $this->get('/foo')->assertSee('You can see me');
-    }
-}
+
+test('it will render something only when the corresponding feature flag is enabled', function () {
+    ConfigCat::fake([
+        'enabled_feature' => true,
+        'disabled_feature' => false,
+    ]);
+
+    Route::get('/foo', function () {
+        return view('feature');
+    });
+
+    $this->get('/foo')->assertDontSee('I am hidden');
+});
+
+test('it will consider an unknown feature flag to be disabled', function () {
+    ConfigCat::fake([
+        'enabled_feature' => true,
+        'disabled_feature' => false,
+    ]);
+
+    Route::get('/foo', function () {
+        return view('feature');
+    });
+
+    $this->get('/foo')->assertSee('You can see me');
+});
+
+test('it will consider a feature flag as a number setting to be disabled', function () {
+    ConfigCat::fake([
+        'enabled_feature' => 1234,
+        'disabled_feature' => false,
+    ]);
+
+    Route::get('/foo', function () {
+        return view('feature');
+    });
+
+    $this->get('/foo')->assertDontSee('I should be visible');
+    $this->get('/foo')->assertSee('I should not be visible');
+});
+
+test('it will consider a feature flag as a text setting to be disabled', function () {
+    ConfigCat::fake([
+        'enabled_feature' => 'foobar',
+        'disabled_feature' => false,
+    ]);
+
+    Route::get('/foo', function () {
+        return view('feature');
+    });
+
+    $this->get('/foo')->assertDontSee('I should be visible');
+    $this->get('/foo')->assertSee('I should not be visible');
+});
+
+test('it supports the unlessconfigcat directive', function () {
+    ConfigCat::fake([
+        'enabled_feature' => true,
+        'disabled_feature' => false,
+    ]);
+
+    Route::get('/foo', function () {
+        return view('feature');
+    });
+
+    $this->get('/foo')->assertSee('I am not hidden');
+});
+
+test('it supports the else directive', function () {
+    ConfigCat::fake([
+        'enabled_feature' => false,
+        'disabled_feature' => false,
+    ]);
+
+    Route::get('/foo', function () {
+        return view('feature');
+    });
+
+    $this->get('/foo')->assertDontSee('I should be visible');
+    $this->get('/foo')->assertSee('I should not be visible');
+});
+
+test('it supports the elseconfigcat directive', function () {
+    ConfigCat::fake([
+        'enabled_feature' => true,
+        'disabled_feature' => false,
+    ]);
+
+    Route::get('/foo', function () {
+        return view('feature');
+    });
+
+    $this->get('/foo')->assertDontSee('You cannot see me');
+    $this->get('/foo')->assertSee('You can see me');
+});