Bump PHP requirement to 8.1

Author: norkunas

.github/workflows/meilisearch-beta-tests.yml

@@ -38,13 +38,9 @@ jobs:
           MEILI_NO_ANALYTICS: true
     strategy:
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-version: ['8.1', '8.2', '8.3', '8.4']
         http-client: ['Guzzle-7', 'Guzzle-7-Adapter', 'Symfony-HttpClient', 'PHP-HTTP-CurlClient', 'Kriswallsmith-Buzz']
         exclude:
-          - php-version: '7.4'
-            http-client: 'Symfony-HttpClient'
-          - php-version: '8.0'
-            http-client: 'Symfony-HttpClient'
           - php-version: '8.1'
             http-client: 'Symfony-HttpClient'
 

.github/workflows/pre-release-tests.yml

@@ -38,13 +38,9 @@ jobs:
           MEILI_NO_ANALYTICS: true
     strategy:
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-version: ['8.1', '8.2', '8.3', '8.4']
         http-client: ['Guzzle-7', 'Guzzle-7-Adapter', 'Symfony-HttpClient', 'PHP-HTTP-CurlClient', 'Kriswallsmith-Buzz']
         exclude:
-          - php-version: '7.4'
-            http-client: 'Symfony-HttpClient'
-          - php-version: '8.0'
-            http-client: 'Symfony-HttpClient'
           - php-version: '8.1'
             http-client: 'Symfony-HttpClient'
     steps:
@@ -88,39 +84,3 @@ jobs:
 
       - name: Run test suite
         run: sh scripts/tests.sh
-
-  test_php_7_guzzle_6:
-    runs-on: ubuntu-latest
-    needs: ['meilisearch-version']
-    name: integration-tests-against-rc (PHP 7.4 & Guzzle 6)
-    services:
-      meilisearch:
-        image: getmeili/meilisearch:${{ needs.meilisearch-version.outputs.version }}
-        env:
-          MEILI_MASTER_KEY: 'masterKey'
-          MEILI_NO_ANALYTICS: 'true'
-        ports:
-          - '7700:7700'
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '7.4'
-          coverage: none
-
-      - name: Validate composer.json and composer.lock
-        run: composer validate
-
-      - name: Switch to Guzzle 6
-        run: |
-          sed -i 's/"guzzlehttp\/guzzle": "^[0-9]\+\.[0-9]\+\.[0-9]\+\",/"php-http\/guzzle6-adapter": "^2.0.2",/' composer.json
-
-      - name: Install dependencies
-        uses: ramsey/composer-install@v3
-
-      - name: Run test suite - php-http/guzzle6-adapter
-        run: sh scripts/tests.sh

.github/workflows/tests.yml

@@ -79,13 +79,9 @@ jobs:
           MEILI_NO_ANALYTICS: true
     strategy:
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-version: ['8.1', '8.2', '8.3', '8.4']
         http-client: ['Guzzle-7', 'Guzzle-7-Adapter', 'Symfony-HttpClient', 'PHP-HTTP-CurlClient', 'Kriswallsmith-Buzz']
         exclude:
-          - php-version: '7.4'
-            http-client: 'Symfony-HttpClient'
-          - php-version: '8.0'
-            http-client: 'Symfony-HttpClient'
           - php-version: '8.1'
             http-client: 'Symfony-HttpClient'
 
@@ -150,30 +146,6 @@ jobs:
           MEILI_MASTER_KEY: masterKey
           MEILI_NO_ANALYTICS: true
 
-    name: integration-tests (PHP 7.4 & Guzzle 6)
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '7.4'
-          coverage: none
-
-      - name: Validate composer.json and composer.lock
-        run: composer validate
-
-      - name: Switch to Guzzle 6
-        run: |
-          sed -i 's/"guzzlehttp\/guzzle": "^[0-9]\+\.[0-9]\+\.[0-9]\+\",/"php-http\/guzzle6-adapter": "^2.0.2",/' composer.json
-
-      - name: Install dependencies
-        uses: ramsey/composer-install@v3
-
-      - name: Run test suite - php-http/guzzle6-adapter
-        run: sh scripts/tests.sh
-
   upload-coverage:
     name: Upload coverage to Codecov
     runs-on: ubuntu-latest

.php-cs-fixer.dist.php

@@ -16,8 +16,7 @@
         'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced'],
         'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
         'php_unit_strict' => true,
-        // @todo: when we'll support only PHP 8.0 and upper, we can enable `parameters` for `trailing_comma_in_multiline` rule
-        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['array_destructuring', 'arrays', 'match'/* , 'parameters' */]],
+        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['array_destructuring', 'arrays', 'match', 'parameters']],
     ])
     ->setRiskyAllowed(true)
     ->setFinder($finder);

composer.json

@@ -19,9 +19,9 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.1",
         "ext-json": "*",
-        "php-http/discovery": "^1.7",
+        "php-http/discovery": "^1.19",
         "psr/http-client": "^1.0"
     },
     "autoload": {
@@ -40,7 +40,7 @@
         "http-interop/http-factory-guzzle": "Factory for guzzlehttp/guzzle"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5 || ^10.5",
+        "phpunit/phpunit": "^10.5",
         "php-cs-fixer/shim": "^3.59.3",
         "guzzlehttp/guzzle": "^7.8.1",
         "http-interop/http-factory-guzzle": "^1.2.0",

src/Client.php

@@ -50,7 +50,7 @@ public function __construct(
         ?ClientInterface $httpClient = null,
         ?RequestFactoryInterface $requestFactory = null,
         array $clientAgents = [],
-        ?StreamFactoryInterface $streamFactory = null
+        ?StreamFactoryInterface $streamFactory = null,
     ) {
         $this->http = new MeilisearchClientAdapter($url, $apiKey, $httpClient, $requestFactory, $clientAgents, $streamFactory);
         $this->index = new Indexes($this->http);

src/Endpoints/Keys.php

@@ -95,7 +95,7 @@ protected function createDate($attribute): ?\DateTimeInterface
             return null;
         }
 
-        if (false === strpos($attribute, '.')) {
+        if (!str_contains($attribute, '.')) {
             $date = \DateTimeImmutable::createFromFormat(\DateTimeInterface::ATOM, $attribute);
         } else {
             $attribute = preg_replace('/(\.\d{6})\d+/', '$1', $attribute, 1);

src/Http/Client.php

@@ -41,7 +41,7 @@ public function __construct(
         ?ClientInterface $httpClient = null,
         ?RequestFactoryInterface $reqFactory = null,
         array $clientAgents = [],
-        ?StreamFactoryInterface $streamFactory = null
+        ?StreamFactoryInterface $streamFactory = null,
     ) {
         $this->baseUrl = $url;
         $this->http = $httpClient ?? Psr18ClientDiscovery::find();