PHP 8 Support

.circleci/apply-phpunit-patches.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# All commands below must no fail
+set -e
+
+# Be in the root dir
+cd "$(dirname $0)/../"
+
+find tests/ -type f -print0 | xargs -0 sed -i 's/function setUpBeforeClass()/function setUpBeforeClass(): void/g';
+find tests/ -type f -print0 | xargs -0 sed -i 's/function tearDownAfterClass()/function tearDownAfterClass(): void/g';
+find tests/ -type f -print0 | xargs -0 sed -i 's/function setUp()/function setUp(): void/g';
+find tests/ -type f -print0 | xargs -0 sed -i 's/function tearDown()/function tearDown(): void/g';
+
+# Return back to original dir
+cd - > /dev/null

.circleci/config.yml

@@ -8,31 +8,41 @@ version: 2.1
 executors:
   php-docker: # declares a reusable executor
     parameters:
+      image:
+        description: "Docker image"
+        type: string
       version:
         description: "PHP version tag"
         type: string
     docker:
-        - image: circleci/php:<<parameters.version>>
+      - image: <<parameters.image>>:<<parameters.version>>
 
 jobs:
   test:
     parameters:
+      image:
+        description: "Docker image"
+        type: string
       version:
         description: "PHP version tag"
         type: string
       http_client:
-        description: "PHP Client"
+        description: "PHP client"
         type: string
 
     executor:
       name: php-docker
+      image: <<parameters.image>>
       version: <<parameters.version>>
 
     steps:
       - checkout
 
       - run: sudo apt update
-      - run: sudo docker-php-ext-install zip
+      - run: |
+          if [ "<<parameters.image>>" = "circleci/php" ]; then
+              sudo docker-php-ext-install zip
+          fi
 
       # Download and cache dependencies
       - restore_cache:
@@ -41,7 +51,12 @@ jobs:
             # fallback to using the latest cache if no exact match is found
             #- composer-deps-
 
-      - run: composer install -n --prefer-dist
+      - run: |
+          if [ "<<parameters.version>>" != "8.0" ]; then
+            composer install -n --prefer-dist
+          else
+            composer install -n --prefer-dist --ignore-platform-req=php
+          fi
 
       - save_cache:
           key: composer-deps-<<parameters.version>>-{{ checksum "composer.json" }}
@@ -51,7 +66,7 @@ jobs:
       - run:
           name: Install PHP Client
           command: |
-            if [ "<<parameters.http_client>>" == "legacy" ]
+            if [ "<<parameters.http_client>>" == "default" ]
             then
                echo "Nothing to install, using default Algolia\AlgoliaSearch\Http\Php53HttpClient"
             else
@@ -64,14 +79,25 @@ jobs:
 
       - run:
           name: Check code styles
-          command: vendor/bin/php-cs-fixer fix -v --dry-run
+          command: |
+            if [ "<<parameters.version>>" != "8.0" ]; then
+              vendor/bin/php-cs-fixer fix -v --dry-run
+            fi
+
+      - run:
+          name: Patch PHPUnit tests
+          command: |
+            if [[ "<<parameters.version>>" == "7.4" || "<<parameters.version>>" == "8.0" ]]; then
+              ./.circleci/apply-phpunit-patches.sh
+            fi
 
       # Run tests with phpunit
       #
       # If the PR is open by an Algolia, we run all the tests
       # with the keys in the env variables
       # If the PR was open from a fork (community PR)
       # we get API keys from the API key dealer https://alg.li/api-key-dealer
+
       - run:
           name: Run tests
           command: |
@@ -83,47 +109,71 @@ jobs:
               export CI_PROJ_USERNAME=$CIRCLE_PROJECT_USERNAME
               export CI_PROJ_REPONAME=$CIRCLE_PROJECT_REPONAME
 
-              eval $(./algolia-keys export)
-              php vendor/bin/phpunit -v --testsuite Unit,Definition,Community
+              eval $(./algolia-keys export) && php vendor/bin/phpunit -v --testsuite Unit,Definition,Community
             fi
 
       - run:
           name: Autoloading without Composer
-          command: php tests/tests-no-composer.php
+          command: |
+            export CI_BUILD_NUM=$CIRCLE_BUILD_NUM
+            if [ -z ${CIRCLE_PR_REPONAME+x} ]
+            then
+               php vendor/bin/phpunit
+            else
+              export CI_PROJ_USERNAME=$CIRCLE_PROJECT_USERNAME
+              export CI_PROJ_REPONAME=$CIRCLE_PROJECT_REPONAME
+
+              eval $(./algolia-keys export) && php tests/tests-no-composer.php
+            fi
 
 
 workflows:
   workflow:
     jobs:
       - test:
-          version: "latest"
+          name: "PHP 8.0 - Guzzle 7"
+          image: cimg/php
+          version: "8.0"
           http_client: guzzlehttp/guzzle:"^7.0"
       - test:
+          name: "PHP 7.4 - Guzzle 7"
+          image: cimg/php
           version: "7.4"
           http_client: guzzlehttp/guzzle:"^7.0"
 
       - test:
-          version: "latest"
-          http_client: guzzlehttp/guzzle:"^6.0"
-      - test:
+          name: "PHP 7.4 - Guzzle 6"
+          image: cimg/php
           version: "7.4"
           http_client: guzzlehttp/guzzle:"^6.0"
       - test:
+          name: "PHP 7.0 - Guzzle 6"
+          image: circleci/php
           version: "7.0"
           http_client: guzzlehttp/guzzle:"^6.0"
       - test:
+          name: "PHP 5.6 - Guzzle 6"
+          image: cimg/php
           version: "5.6"
           http_client: guzzlehttp/guzzle:"^6.0"
 
       - test:
-          version: "latest"
-          http_client: legacy
+          name: "PHP 8.0 - Default client"
+          image: cimg/php
+          version: "8.0"
+          http_client: default
       - test:
+          name: "PHP 7.4 - Default client"
+          image: cimg/php
           version: "7.4"
-          http_client: legacy
+          http_client: default
       - test:
+          name: "PHP 7.0 - Default client"
+          image: circleci/php
           version: "7.0"
-          http_client: legacy
+          http_client: default
       - test:
+          name: "PHP 5.6 - Default client"
+          image: cimg/php
           version: "5.6"
-          http_client: legacy
+          http_client: default

.gitattributes

@@ -2,16 +2,18 @@
 
 /docs              export-ignore
 /tests             export-ignore
+/.circleci         export-ignore
 /.github           export-ignore
 .editorconfig      export-ignore
 .gitattributes     export-ignore
 .gitignore         export-ignore
 .php_cs            export-ignore
 .php_cs.dist       export-ignore
 .styleci.yml       export-ignore
-.travis.yml        export-ignore
 CHANGELOG.md       export-ignore
 CONTRIBUTING.md    export-ignore
+DOCKER_README.md   export-ignore
 MAINTAINERS.md     export-ignore
 phpunit.xml.dist   export-ignore
 README.md          export-ignore
+SECURITY.md        export-ignore

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased](https://github.com/algolia/algoliasearch-client-php/compare/2.7.2...master)
 
+### Added
+- PHP 8 Support
+
+
 ## [v2.7.2](https://github.com/algolia/algoliasearch-client-php/compare/2.7.1...2.7.2)
 
 ### Chore
@@ -16,7 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [v2.7.1](https://github.com/algolia/algoliasearch-client-php/compare/2.7.0...2.7.1)
 
 ### Fix
-- Enable `JSON_UNESCAPED_UNICODE` option for requests bodies JSON encoding. 
+- Enable `JSON_UNESCAPED_UNICODE` option for requests bodies JSON encoding.
 
 ## [v2.7.0](https://github.com/algolia/algoliasearch-client-php/compare/2.6.2...2.7.0)
 

README.md

@@ -6,7 +6,7 @@
   <h4 align="center">The perfect starting point to integrate <a href="https://algolia.com" target="_blank">Algolia</a> within your PHP project</h4>
 
   <p align="center">
-    <a href="https://travis-ci.org/algolia/algoliasearch-client-php"><img src="https://img.shields.io/travis/algolia/algoliasearch-client-php/master.svg" alt="Build Status"></a>
+    <a href="https://circleci.com/gh/algolia/algoliasearch-client-php"><img src="https://circleci.com/gh/algolia/algoliasearch-client-php.svg?style=shield" alt="CircleCI" /></a>
     <a href="https://packagist.org/packages/algolia/algoliasearch-client-php"><img src="https://poser.pugx.org/algolia/algoliasearch-client-php/d/total.svg" alt="Total Downloads"></a>
     <a href="https://packagist.org/packages/algolia/algoliasearch-client-php"><img src="https://poser.pugx.org/algolia/algoliasearch-client-php/v/stable.svg" alt="Latest Version"></a>
     <a href="https://packagist.org/packages/algolia/algoliasearch-client-php"><img src="https://poser.pugx.org/algolia/algoliasearch-client-php/license.svg" alt="License"></a>

composer.json

@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "php": "^5.3 || ^7.0",
+        "php": "^5.3 || ^7.0 || ^8.0",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
@@ -20,9 +20,9 @@
         "psr/simple-cache": "^1.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.0",
-        "fzaninotto/faker": "^1.8",
-        "phpunit/phpunit": "^4.8",
+        "friendsofphp/php-cs-fixer": "^2.17.1",
+        "fakerphp/faker": "^1.9.1",
+        "phpunit/phpunit": "^4.8 || ^8.5",
         "symfony/yaml": "^2.0 || ^4.0"
     },
     "autoload": {