Merge pull request #57 from arsonik/php74

Php 7.4
daryl-software · Mar 30, 2020 · c97f029 · c97f029
2 parents 2512218 + 76b12a0
commit c97f029
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 32 deletions.
diff --git a/composer.json b/composer.json
@@ -17,8 +17,8 @@
         }
     },
     "require": {
-        "php": "^7.1",
-        "doctrine/dbal": "^2.5.2",
+        "php": "^7.4",
+        "doctrine/dbal": "^2.10.1",
         "psr/cache": "^1.0",
         "cache/apcu-adapter": "^1.0"
     },

diff --git a/config/docker/php/behat/Dockerfile b/config/docker/php/behat/Dockerfile
@@ -1,13 +1,14 @@
-FROM isanosyan/php:7.1-cli-base
+FROM php:7.4-cli
 
-RUN apt-get update
-RUN apt-get install -y git file libpq-dev php-apcu php7.1-dev php7.1-mbstring php7.1-mysql php7.1-pgsql
-RUN cd /tmp/ && git clone git://github.com/xdebug/xdebug.git
-RUN cd /tmp/xdebug && git checkout XDEBUG_2_5_5 && phpize && ./configure --enable-xdebug && make && make install
+RUN apt-get update && apt-get install -y libpq-dev \
+    && docker-php-ext-configure pgsql \
+    && docker-php-ext-install -j$(nproc) pcntl pdo_pgsql pdo_mysql mysqli \
+    && docker-php-ext-enable pcntl pdo_pgsql pdo_mysql mysqli
 
-COPY apc.ini /etc/php/7.1/mods-available/apcu.ini
-RUN phpenmod -v ALL -s ALL apcu
+RUN pecl install redis apcu xdebug \
+    && docker-php-ext-enable redis xdebug apcu
 
+COPY apc.ini /etc/php/7.4/mods-available/apcu.ini
 
 ENTRYPOINT ["php", "/scripts/vendor/bin/behat"]
 

diff --git a/config/docker/php/composer/Dockerfile b/config/docker/php/composer/Dockerfile
@@ -1,6 +1,7 @@
-FROM php:7.1-fpm-alpine
+FROM php:7.4-cli
 
-RUN docker-php-ext-install mbstring
+RUN apt-get update && apt-get install -y libonig-dev zip \
+    && docker-php-ext-install mbstring
 
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir /usr/local/bin --filename composer
 

diff --git a/config/docker/php/vendor/Dockerfile b/config/docker/php/vendor/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-fpm-alpine
+FROM php:7.4-cli
 
 VOLUME /scripts/vendor/
 

diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
@@ -363,10 +363,8 @@ public function theLastQuerySucceededOn($connectionName): void
     {
         if ($this->connections[$connectionName]['last-result'] === null) {
             $lastError = $this->connections[$connectionName]['last-error'];
-            if ($lastError instanceof \Exception) {
+            if ($lastError instanceof \Throwable) {
                 $message = $lastError->getMessage();
-            } else if ($lastError !== null) {
-                $message = print_r($lastError, true);
             } else {
                 $message = print_r($lastError, true);
             }

diff --git a/features/bootstrap/MySQLContext.php b/features/bootstrap/MySQLContext.php
@@ -1,15 +1,13 @@
 <?php
 
-use Doctrine\DBAL\DriverManager;
-
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver\DriverException as DDriverException;
 use Doctrine\DBAL\Exception\DriverException as EDriverException;
 use Ez\DbLinker\Driver\Connection\RetryConnection;
 
 trait MySQLContext
 {
-    private function masterParams($username = null, $password = '') {
+    protected function masterParams($username = null, $password = '') {
         $params = [
             'host'          => getenv('DBLINKER_MYSQL_MASTER_1_PORT_3306_TCP_ADDR'),
             'user'          => getenv('DBLINKER_MYSQL_MASTER_1_ENV_MYSQL_USER'),
@@ -49,7 +47,7 @@ private function defaultDatabaseName()
         return getenv('DBLINKER_MYSQL_MASTER_1_ENV_MYSQL_DATABASE');
     }
 
-    private function activeConnectionsCount()
+    protected function activeConnectionsCount()
     {
         $connection = $this->rootConnection();
         gc_collect_cycles();
@@ -94,12 +92,12 @@ public function clearConnections()
         gc_collect_cycles();
     }
 
-    private function retryStrategy($n)
+    protected function retryStrategy($n)
     {
         return new MysqlRetryStrategy($n);
     }
 
-    private function errorCode(Exception $exception)
+    protected function errorCode(Exception $exception)
     {
         if ($exception instanceof DBALException) {
             $exception = $exception->getPrevious();
@@ -124,7 +122,7 @@ private function prepareSql($sql)
         return $sql;
     }
 
-    private function errorToCode($error)
+    protected function errorToCode($error)
     {
         $errors = [
             "BAD_DB" => 1049,
@@ -149,7 +147,7 @@ class MysqlRetryStrategy extends Ez\DbLinker\RetryStrategy\MysqlRetryStrategy
     private $lastError = null;
     private $handlers = [];
 
-    public function shouldRetry(Exception $exception, RetryConnection $connection) {
+    public function shouldRetry(Exception $exception, RetryConnection $connection): bool {
         $this->lastError = $exception;
         return array_reduce($this->handlers, function($retry, Closure $handler) use ($exception, $connection) {
             return $retry || $handler($exception, $connection);

diff --git a/features/bootstrap/PostgreSQLContext.php b/features/bootstrap/PostgreSQLContext.php
@@ -5,7 +5,7 @@
 
 trait PostgreSQLContext
 {
-    private function masterParams($username = null, $password = '') {
+    protected function masterParams($username = null, $password = '') {
         $params = [
             'host'          => getenv('DBLINKER_POSTGRESQL_MASTER_1_PORT_5432_TCP_ADDR'),
             'user'          => getenv('DBLINKER_POSTGRESQL_MASTER_1_ENV_POSTGRES_USER'),
@@ -46,7 +46,7 @@ private function defaultDatabaseName()
         return getenv('DBLINKER_POSTGRESQL_MASTER_1_ENV_POSTGRES_DB');
     }
 
-    private function activeConnectionsCount()
+    protected function activeConnectionsCount()
     {
         return 0;
     }
@@ -75,13 +75,13 @@ public function clearConnections()
         ];
     }
 
-    private function retryStrategy($n)
+    protected function retryStrategy($n)
     {
         return new PostgreSQLRetryStrategy($n);
     }
 
 
-    private function errorCode(Exception $exception)
+    protected function errorCode(Exception $exception)
     {
         if(preg_match("/SQLSTATE\[(?<errorCode>[A-Z0-9]*)\]/", $exception->getMessage(), $matches)) {
             $code = $matches["errorCode"];
@@ -94,12 +94,12 @@ private function errorCode(Exception $exception)
 
     private function retryDriverClass()
     {
-        return "Ez\DbLinker\Driver\PostgresqlRetryDriver";
+        return Ez\DbLinker\Driver\PostgresqlRetryDriver::class;
     }
 
     private function masterSlaveDriverClass()
     {
-        return "Ez\DbLinker\Driver\PostgresqlMasterSlavesDriver";
+        return Ez\DbLinker\Driver\PostgresqlMasterSlavesDriver::class;
     }
 
     private function prepareSql($sql)
@@ -110,7 +110,7 @@ private function prepareSql($sql)
         return $sql;
     }
 
-    private function errorToCode($error)
+    protected function errorToCode($error)
     {
         if ($error === null) {
             return;
@@ -138,7 +138,7 @@ class PostgreSQLRetryStrategy extends Ez\DbLinker\RetryStrategy\PostgreSQLRetryS
     public function shouldRetry(
         Exception $exception,
         RetryConnection $connection
-    ) {
+    ): bool {
         $this->lastError = $exception;
         return array_reduce($this->handlers, function($retry, Closure $handler) use ($exception, $connection) {
             return $retry || $handler($exception, $connection);

diff --git a/features/master-slave.feature b/features/master-slave.feature
@@ -1,7 +1,7 @@
 @master-slaves
 Feature: Master / Slaves
 
-    Background:
+  Background:
       Given a master-slaves connection "conn" with 3 slaves
 
     Scenario: Insert a row on master