Merge pull request #5 from kobi97/improve/upgrade_php_mysql_replication

Improve/upgrade php mysql replication

Author: kobi97

.travis.yml

@@ -3,6 +3,9 @@ language: php
 php:
   - '7.1'
 
+env:
+  - DB=mariadb-10.0
+  - DB=mariadb-10.1
 services:
   - docker
 
@@ -13,30 +16,32 @@ cache:
     - $HOME/.composer/cache
 
 before_script:
-  - docker build -t db-master ./demo/Resources/docker/db-master
-  - docker build -t db-slave ./demo/Resources/docker/db-slave
-  - docker build -t db-slave-slave ./demo/Resources/docker/db-slave-slave
+  - "if [ $DB = 'mariadb-10.0' ]; then docker build -t db-master -f ./demo/Resources/docker/db-master/Dockerfile-10.0 ./demo/Resources/docker/db-master; fi"
+  - "if [ $DB = 'mariadb-10.0' ]; then docker build -t db-slave -f ./demo/Resources/docker/db-slave/Dockerfile-10.0 ./demo/Resources/docker/db-slave; fi"
+  - "if [ $DB = 'mariadb-10.1' ]; then docker build -t db-master -f ./demo/Resources/docker/db-master/Dockerfile-10.1 ./demo/Resources/docker/db-master; fi"
+  - "if [ $DB = 'mariadb-10.1' ]; then docker build -t db-slave -f ./demo/Resources/docker/db-slave/Dockerfile-10.1 ./demo/Resources/docker/db-slave; fi"
+  - "if [ $DB = 'mariadb-10.2' ]; then docker build -t db-master -f ./demo/Resources/docker/db-master/Dockerfile-10.2 ./demo/Resources/docker/db-master; fi"
+  - "if [ $DB = 'mariadb-10.2' ]; then docker build -t db-slave -f ./demo/Resources/docker/db-slave/Dockerfile-10.2 ./demo/Resources/docker/db-slave; fi"
   - docker run -p 13306:3306  --name db-master -e MYSQL_ROOT_PASSWORD=1234 -d db-master
   - docker run -p 13307:3306 --name db-slave --link db-master:master -e MYSQL_ROOT_PASSWORD=1234 -d db-slave
-  - docker run -p 13308:3306  --name db-slave-slave --link db-slave:slave -e MYSQL_ROOT_PASSWORD=1234 -d db-slave-slave
   - sleep 60;
   - docker exec -it db-master bash -c "mysql -uroot -p1234 < temp/my.master.sql"
   - sleep 5;
   - docker exec -it db-slave bash -c "mysql -uroot -p1234 < temp/my.slave.sql"
   - sleep 5;
-  - docker exec -it db-slave-slave bash -c "mysql -uroot -p1234 < temp/my.slave-slave.sql"
-  - sleep 5;
   - docker exec -it db-master bash -c "mysql -uroot -p1234 < temp/my.master.init_test.sql"
   - sleep 5
 
 install:
   travis_retry composer install --no-interaction --prefer-dist;
 
 script:
- - php ./demo/cron/\[every\]binlog_collect_partitioner.php change_pos mariadb-bin.000004 4
- - php ./demo/cron/\[every\]binlog_collect_partitioner.php continue
- - php ./demo/cron/\[every\]binlog_collect_worker.php
- - php ./demo/cron/\[every\]binlog_collect_worker.php
- - php ./demo/cron/\[every\]binlog_collect_worker.php
- - cd tests
- - ../vendor/bin/phpunit
+  - "if [ $DB = 'mariadb-10.0' ]; then php ./demo/cron/[every]binlog_collect_partitioner.php change_pos mariadb-bin.000004 4; fi"
+  - "if [ $DB = 'mariadb-10.1' ]; then php ./demo/cron/[every]binlog_collect_partitioner.php change_pos mariadb-bin.000005 4; fi"
+  - "if [ $DB = 'mariadb-10.2' ]; then php ./demo/cron/[every]binlog_collect_partitioner.php change_pos mariadb-bin.000003 4; fi"
+  - php ./demo/cron/\[every\]binlog_collect_partitioner.php continue
+  - php ./demo/cron/\[every\]binlog_collect_worker.php
+  - php ./demo/cron/\[every\]binlog_collect_worker.php
+  - php ./demo/cron/\[every\]binlog_collect_worker.php
+  - cd tests
+  - ../vendor/bin/phpunit

CHANGELOG.md

@@ -4,8 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.2.0] - 2019-08-09
+### CHANGED
+- upgrade php-mysql-replication v6.0.1
+- add test env=mariadb-10.1
+
 ## [1.1.1] - 2018-11-12
-###CHANGED
+### CHANGED
 - upgrade php-mysql-replication v5.0.5
 -- fixed support to recive more than 16Mbyte + tests
 - change mariadb's confs

composer.json

@@ -11,7 +11,7 @@
   ],
   "require": {
     "illuminate/support": "^5.4",
-    "krowinski/php-mysql-replication": "5.0.5",
+    "krowinski/php-mysql-replication": "6.0.1",
     "monolog/monolog": "^1.18.0",
     "ridibooks/platform-gnfdb": "^0.1",
     "vlucas/phpdotenv": "^2.4",