Removed Travis CI in favor of Github action

elastic · Aug 20, 2020 · 7dee03c · 7dee03c
1 parent f729b18
commit 7dee03c
Show file tree

Hide file tree

Showing 19 changed files with 242 additions and 188 deletions.
diff --git a/.ci/yaml-tests.sh b/.ci/yaml-tests.sh
@@ -4,4 +4,4 @@
 php util/RestSpecRunner.php
 
 # Run YAML tests
-vendor/bin/phpunit -c phpunit-integration.xml --group sync
+vendor/bin/phpunit -c phpunit-yaml-tests.xml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,74 @@
+name: PHP test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: Test
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        php-version: [7.1, 7.2, 7.3, 7.4]
+        os: [ubuntu-latest]
+        es-version: [7.x-SNAPSHOT]
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Use PHP ${{ matrix.php-version }}
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-version }}
+        tools: prestissimo
+      env:
+        COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Get composer cache directory
+      id: composercache
+      run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+    - name: Cache dependencies
+      uses: actions/cache@v2
+      with:
+        path: ${{ steps.composercache.outputs.dir }}
+        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+        restore-keys: ${{ runner.os }}-composer-
+
+    - name: Install dependencies
+      run: |
+        composer install --prefer-dist
+
+    - name: PHP Coding Standards
+      run: |
+        composer run-script phpcs
+
+    - name: PHP Static Analysis Tool
+      run: |
+        composer run-script phpstan
+
+    - name: Unit tests
+      run: |
+        vendor/bin/phpunit -c phpunit.xml.dist
+      env:
+        TEST_SUITE: oss
+
+    - name: Configure sysctl limits
+      run: |
+        sudo swapoff -a
+        sudo sysctl -w vm.swappiness=1
+        sudo sysctl -w fs.file-max=262144
+        sudo sysctl -w vm.max_map_count=262144
+
+    - name: Runs Elasticsearch ${{ matrix.es-version }}
+      uses: elastic/elastic-github-actions/elasticsearch@master
+      with:
+        stack-version: ${{ matrix.es-version }}
+
+    - name: Integration tests
+      run: |
+        vendor/bin/phpunit -c phpunit-integration-tests.xml
+      env:
+        TEST_SUITE: oss
+
diff --git a/.travis.yml b/.travis.yml
diff --git a/phpstan.neon b/phpstan.neon
@@ -2,7 +2,7 @@ parameters:
     reportUnmatchedIgnoredErrors:
         false
     ignoreErrors:
-        - '#Unsafe usage of new static()#'
+        - '#Unsafe usage of new static\(\)#'
         - '#Call to static method performRequest\(\) on trait#'
         - '#Constant JSON_THROW_ON_ERROR not found#'
         - '#Caught class JsonException not found#'

diff --git a/phpunit-integration-tests.xml b/phpunit-integration-tests.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd"
+        bootstrap="tests/bootstrap.php"
+        colors="true"
+        failOnRisky="true"
+        verbose="true"
+        beStrictAboutChangesToGlobalState="true"
+        beStrictAboutOutputDuringTests="true"
+>
+    <testsuites>
+        <testsuite name="Integration tests">
+            <directory>tests</directory>
+            <exclude>tests/Elasticsearch/Tests/YamlRunnerTest.php</exclude>
+        </testsuite>
+    </testsuites>
+    <groups>
+        <include>
+            <group>Integration</group>
+        </include>
+    </groups>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/phpunit-yaml-tests.xml b/phpunit-yaml-tests.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd"
+         bootstrap="tests/bootstrap.php"
+         colors="true"
+         failOnRisky="true"
+         verbose="true"
+         beStrictAboutChangesToGlobalState="true"
+         beStrictAboutOutputDuringTests="true"
+>
+    <php>
+        <!-- Disable E_USER_DEPRECATED setting E_ALL & ~E_USER_DEPRECATED-->
+        <ini name="error_reporting" value="16383"/>
+    </php>
+    <testsuites>
+        <testsuite name="Yaml tests">
+            <file>tests/Elasticsearch/Tests/YamlRunnerTest.php</file>
+        </testsuite>
+    </testsuites>
+    <groups>
+        <include>
+            <group>sync</group>
+        </include>
+    </groups>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="junit" target="tests/yaml-test-junit.xml"/>
+    </logging>
+</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,15 +8,17 @@
         beStrictAboutChangesToGlobalState="true"
         beStrictAboutOutputDuringTests="true"
 >
-    <php>
-        <env name="ES_TEST_HOST" value=""/>
-    </php>
     <testsuites>
-        <testsuite name="Tests">
+        <testsuite name="Unit tests">
             <directory>tests</directory>
             <exclude>tests/Elasticsearch/Tests/YamlRunnerTest.php</exclude>
         </testsuite>
     </testsuites>
+    <groups>
+        <exclude>
+            <group>Integration</group>
+        </exclude>
+    </groups>
     <filter>
         <whitelist>
             <directory suffix=".php">src</directory>

diff --git a/ruleset.xml b/ruleset.xml
@@ -2,5 +2,6 @@
 <ruleset name="Elasticsearch-PHP">
 	<rule ref="PSR2">
 		<exclude name="Generic.Files.LineLength.TooLong"/>
+		<exclude name="Squiz.WhiteSpace.SuperfluousWhitespace.EndLine"/>
 	</rule>
 </ruleset>
diff --git a/tests/Elasticsearch/Tests/ClientIntegrationTest.php b/tests/Elasticsearch/Tests/ClientIntegrationTest.php
@@ -20,6 +20,7 @@
 
 use Elasticsearch\Client;
 use Elasticsearch\ClientBuilder;
+use Elasticsearch\Common\Exceptions\BadRequest400Exception;
 use Elasticsearch\Common\Exceptions\ElasticsearchException;
 use Elasticsearch\Common\Exceptions\Missing404Exception;
 use Elasticsearch\Tests\ClientBuilder\ArrayLogger;
@@ -29,6 +30,7 @@
  * Class ClientTest
  *
  * @subpackage Tests
+ * @group Integration
  */
 class ClientIntegrationTest extends \PHPUnit\Framework\TestCase
 {
@@ -51,12 +53,21 @@ public function setUp()
         $this->logger = new ArrayLogger();
     }
 
-    public function testLogRequestSuccessHasInfoNotEmpty()
+    private function getClient(): Client
     {
         $client = ClientBuilder::create()
             ->setHosts([$this->host])
-            ->setLogger($this->logger)
-            ->build();
+            ->setLogger($this->logger);
+
+        if (getenv('TEST_SUITE') === 'xpack') {
+            $client->setSSLVerification(__DIR__ . '/../../../.ci/certs/ca.crt');
+        }    
+        return $client->build();
+    }
+
+    public function testLogRequestSuccessHasInfoNotEmpty()
+    {
+        $client = $this->getClient();
 
         $result = $client->info();
 
@@ -65,10 +76,7 @@ public function testLogRequestSuccessHasInfoNotEmpty()
 
     public function testLogRequestSuccessHasPortInInfo()
     {
-        $client = ClientBuilder::create()
-            ->setHosts([$this->host])
-            ->setLogger($this->logger)
-            ->build();
+        $client = $this->getClient();
 
         $result = $client->info();
 
@@ -77,10 +85,7 @@ public function testLogRequestSuccessHasPortInInfo()
 
     public function testLogRequestFailHasWarning()
     {
-        $client = ClientBuilder::create()
-            ->setHosts([$this->host])
-            ->setLogger($this->logger)
-            ->build();
+        $client = $this->getClient();
 
         try {
             $result = $client->get([
@@ -92,6 +97,62 @@ public function testLogRequestFailHasWarning()
         }
     }
 
+    public function testIndexCannotBeEmptyStringForDelete()
+    {
+        $client = $this->getClient();
+
+        $this->expectException(Missing404Exception::class);
+
+        $client->delete(
+            [
+            'index' => '',
+            'id' => 'test'
+            ]
+        );
+    }
+
+    public function testIdCannotBeEmptyStringForDelete()
+    {
+        $client = $this->getClient();
+
+        $this->expectException(BadRequest400Exception::class);
+
+        $client->delete(
+            [
+            'index' => 'test',
+            'id' => ''
+            ]
+        );
+    }
+
+    public function testIndexCannotBeArrayOfEmptyStringsForDelete()
+    {
+        $client = $this->getClient();
+
+        $this->expectException(Missing404Exception::class);
+
+        $client->delete(
+            [
+            'index' => ['', '', ''],
+            'id' => 'test'
+            ]
+        );
+    }
+
+    public function testIndexCannotBeArrayOfNullsForDelete()
+    {
+        $client = $this->getClient();
+
+        $this->expectException(Missing404Exception::class);
+
+        $client->delete(
+            [
+            'index' => [null, null, null],
+            'id' => 'test'
+            ]
+        );
+    }
+
     private function getLevelOutput(string $level, array $output): string
     {
         foreach ($output as $out) {