Used php-actions

transistive · transistive · commit 8806403fe7e1 · 2021-12-01T14:41:15.000+01:00
diff --git a/.github/workflows/full-test.yml b/.github/workflows/full-test.yml
@@ -1,4 +1,4 @@
-name: Unit and Integration Tests
+name: Full Test
 
 on:
   push:
@@ -10,20 +10,30 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     name: "Create Test Coverage Report"
+    env:
+      NEO4J_CONNECTIONS: ${{ secrets.NEO4J_CONNECTIONS }}
 
-    container:
-      image:  php:8.0-cli
-      env:
-        NEO4J_CONNECTIONS: ${{ secrets.NEO4J_CONNECTIONS }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: php-actions/composer@v6
+        with:
+          progress: yes
+          php_version: 7.4
+          version: 2
+      - uses: php-actions/phpunit@v3
+        with:
+          configuration: phpunit.xml.dist
+          php_version: 7.4
+          php_extensions: bcmath
+          memory_limit: 1024M
+          bootstrap: vendor/autoload.php
 
     services:
       neo4j:
         image: neo4j:4.3
-        ports:
-          - 7474:7474
-          - 7687:7687
         env:
           NEO4J_AUTH: neo4j/test
+          NEO4JLABS_PLUGINS: '["apoc"]'
         options: >-
           --health-cmd "wget http://localhost:7474 || exit 1"
           --health-interval 30s
@@ -32,13 +42,9 @@ jobs:
 
       core1:
         image: neo4j:4.3-enterprise
-        ports:
-          - 7686:7686
-          - 5000
-          - 6000
-          - 7000
         env:
           NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
+          NEO4JLABS_PLUGINS: '["apoc"]'
           NEO4J_AUTH: neo4j/test
           NEO4J_dbms_mode: CORE
           NEO4J_causalClustering_discoveryAdvertisedAddress: core1:5000
@@ -49,18 +55,11 @@ jobs:
           NEO4J_dbms_connectors_default__advertised__address: core1
         options: >-
           --health-cmd "wget http://localhost:7474 || exit 1"
-          --health-interval 30s
-          --health-timeout 10s
-          --health-retries 5
       core2:
         image: neo4j:4.3-enterprise
-        ports:
-          - 7686
-          - 5000
-          - 6000
-          - 7000
         env:
           NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
+          NEO4JLABS_PLUGINS: '["apoc"]'
           NEO4J_AUTH: neo4j/test
           NEO4J_dbms_mode: CORE
           NEO4J_causalClustering_discoveryAdvertisedAddress: core2:5000
@@ -71,13 +70,9 @@ jobs:
 
       core3:
         image: neo4j:4.3-enterprise
-        ports:
-          - 7686
-          - 5000
-          - 6000
-          - 7000
         env:
           NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
+          NEO4JLABS_PLUGINS: '["apoc"]'
           NEO4J_AUTH: neo4j/test
           NEO4J_dbms_mode: CORE
           NEO4J_causalClustering_discoveryAdvertisedAddress: core3:5000
@@ -87,19 +82,12 @@ jobs:
           NEO4J_dbms_connectors_default__advertised__address: core3
         options: >-
           --health-cmd "wget http://localhost:7474 || exit 1"
-          --health-interval 30s
-          --health-timeout 10s
-          --health-retries 5
 
       readreplica1:
         image: neo4j:4.3-enterprise
-        ports:
-          - 7686
-          - 5000
-          - 6000
-          - 7000
         env:
           NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
+          NEO4JLABS_PLUGINS: '["apoc"]'
           NEO4J_AUTH: neo4j/test
           NEO4J_dbms_mode: READ_REPLICA
           NEO4J_causalClustering_discoveryAdvertisedAddress: readreplica1:5000
@@ -109,37 +97,4 @@ jobs:
           NEO4J_dbms_connectors_default__advertised__address: readreplica1
         options: >-
           --health-cmd "wget http://localhost:7474 || exit 1"
-          --health-interval 30s
-          --health-timeout 10s
-          --health-retries 5
 
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup PHP
-        run: |
-          apt-get update && apt-get install -y \
-            libzip-dev \
-            unzip \
-            wget \
-            git \
-            && docker-php-ext-install -j$(nproc) bcmath \
-            && pecl install xdebug \
-            && docker-php-ext-enable xdebug
-      - name: Install Composer
-        run: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-      - name: Install dependencies
-        run: /usr/local/bin/composer install
-      - name: Install Code Climate Test Reporter
-        run: |
-          wget https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 \
-              && mv test-reporter-latest-linux-amd64 /usr/bin/cc-test-reporter  \
-              && chmod +x /usr/bin/cc-test-reporter
-      - name: Run PHPUnit Coverage
-        run: |
-          cc-test-reporter before-build \
-            && XDEBUG_MODE=coverage vendor/bin/phpunit --config phpunit.coverage.xml.dist -d memory_limit=1024M \
-            && mkdir -p out/phpunit \
-            && cp out/phpunit/clover.xml clover.xml
-      - name: Run Code Climate Test Reporter
-        run: |
-          cc-test-reporter after-build --id ec331dd009edca126a4c27f4921c129de840c8a117643348e3b75ec547661f28 --exit-code 0
diff --git a/.github/workflows/matrix-test.yml b/.github/workflows/matrix-test.yml
@@ -9,44 +9,35 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
+    env:
+      NEO4J_CONNECTIONS: bolt://neo4j:test@neo4j,http://neo4j:test@neo4j
+    name: "Running test for PHP ${{ matrix.php-version }} on Neo4j ${{ matrix.neo4j-version }} with simple config"
     strategy:
       fail-fast: false
       matrix:
         php-version: ['7.4', '8.0', '8.1']
         neo4j-version: ["3.5", "4.0", "4.1", "4.2", "4.3"]
-    name: "Running test for PHP ${{ matrix.php-version }} on Neo4j ${{ matrix.neo4j-version }} with simple config"
-    container:
-      image:  php:${{ matrix.php-version }}-cli
-      env:
-        NEO4J_CONNECTIONS: bolt://neo4j:test@neo4j,http://neo4j:test@neo4j
 
     services:
       neo4j:
         image: neo4j:${{ matrix.neo4j-version }}
-        ports:
-          - 7474:7474
-          - 7687:7687
         env:
           NEO4J_AUTH: neo4j/test
+          NEO4JLABS_PLUGINS: '["apoc"]'
         options: >-
           --health-cmd "wget http://localhost:7474 || exit 1"
-          --health-interval 30s
-          --health-timeout 10s
-          --health-retries 5
 
     steps:
       - uses: actions/checkout@v2
-      - name: Setup PHP
-        run: |
-          apt-get update && apt-get install -y \
-            libzip-dev \
-            unzip \
-            && docker-php-ext-install -j$(nproc) bcmath \
-      - name: Install Composer
-        run: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-      - name: Install dependencies
-        run: /usr/local/bin/composer install
-      - name: Run Unit tests
-        run: vendor/bin/phpunit tests/Unit
-      - name: Run Integration tests
-        run: vendor/bin/phpunit tests/Integration
+      - uses: php-actions/composer@v6
+        with:
+          progress: yes
+          php_version: ${{ matrix.php-version }}
+          version: 2
+      - uses: php-actions/phpunit@v3
+        with:
+          configuration: phpunit.xml.dist
+          php_version: ${{ matrix.php-version }}
+          php_extensions: bcmath
+          memory_limit: 1024M
+          bootstrap: vendor/autoload.php
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-cli
+FROM php:7.4-cli
 RUN apt-get update \
     && apt-get install -y \
         libzip-dev \
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -49,7 +49,7 @@ services:
     neo4j:
         networks:
             - neo4j
-        image: neo4j:4.3-enterprise
+        image: neo4j:3.5-enterprise
         healthcheck:
             test: "wget http://localhost:7474 || exit 1"
             interval: 30s
@@ -66,7 +66,7 @@ services:
         volumes:
           - ./tests/resources:/import
     core1:
-        image: neo4j:4.3-enterprise
+        image: neo4j:3.5-enterprise
         healthcheck:
             test: "wget http://localhost:7474 || exit 1"
             interval: 30s
@@ -94,7 +94,7 @@ services:
           NEO4J_dbms_connector_bolt_advertised__address: core1:7687
 
     core2:
-        image: neo4j:4.3-enterprise
+        image: neo4j:3.5-enterprise
         healthcheck:
             test: "wget http://localhost:7474 || exit 1"
             interval: 30s
@@ -119,7 +119,7 @@ services:
           - ./tests/resources:/import
 
     core3:
-        image: neo4j:4.3-enterprise
+        image: neo4j:3.5-enterprise
         healthcheck:
             test: "wget http://localhost:7474 || exit 1"
             interval: 30s
@@ -144,7 +144,7 @@ services:
           - ./tests/resources:/import
 
     readreplica1:
-        image: neo4j:4.3-enterprise
+        image: neo4j:3.5-enterprise
         healthcheck:
             test: "wget http://localhost:7474 || exit 1"
             interval: 30s
diff --git a/phpunit.coverage.xml.dist b/phpunit.coverage.xml.dist
@@ -1,9 +1,14 @@
 <phpunit colors="true" verbose="true"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         convertErrorsToExceptions="true"
+         convertDeprecationsToExceptions="true"
 >
     <php>
-        <ini name="memory_limit" value="512M" />
+        <ini name="memory_limit" value="1024M" />
+
     </php>
     <testsuites>
          <testsuite name="Neo4j php test suite">
@@ -14,10 +19,7 @@
         <report>
             <clover outputFile="out/phpunit/clover.xml" />
             <html outputDirectory="out/phpunit/html" />
-            <xml outputDirectory="out/phpunit/xml"/>
             <text outputFile="out/phpunit/out.txt"/>
-            <php outputFile="out/phpunit/out.php"/>
-            <crap4j outputFile="out/phpunit/crap4j.xml"/>
         </report>
         <include>
             <directory suffix=".php">src</directory>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.1-cli`
	`1`	`+FROM php:7.4-cli`
`2`	`2`	`RUN apt-get update \`
`3`	`3`	`&& apt-get install -y \`
`4`	`4`	`libzip-dev \`