Ver Fonte

Merge pull request #184 from alcaeus/test-php-7.2

Add PHP 7.2 to build matrix
Andreas há 8 anos atrás
pai
commit
d889102b31
2 ficheiros alterados com 14 adições e 5 exclusões
  1. 13 4
      .travis.yml
  2. 1 1
      lib/Alcaeus/MongoDbAdapter/Helper/ReadPreference.php

+ 13 - 4
.travis.yml

@@ -8,7 +8,7 @@ matrix:
   fast_finish: true
   include:
     - php: 5.6
-      env: DRIVER_VERSION=stable LEGACY_DRIVER_VERSION=stable COMPOSER_FLAGS="--prefer-dist --prefer-lowest" SERVER_VERSION=3.0
+      env: DRIVER_VERSION=stable LEGACY_DRIVER_VERSION=stable COMPOSER_FLAGS="--prefer-dist --prefer-lowest"
       addons:
         apt:
           sources:
@@ -17,7 +17,7 @@ matrix:
             - "mongodb-upstart"
           packages: ['mongodb-org-server']
     - php: 5.6
-      env: DRIVER_VERSION=stable SERVER_VERSION=3.4
+      env: DRIVER_VERSION=stable
       addons:
         apt:
           sources:
@@ -26,7 +26,7 @@ matrix:
             - "mongodb-upstart"
           packages: ['mongodb-org-server']
     - php: 7.0
-      env: DRIVER_VERSION=stable SERVER_VERSION=3.4
+      env: DRIVER_VERSION=stable
       addons:
         apt:
           sources:
@@ -35,7 +35,16 @@ matrix:
             - "mongodb-upstart"
           packages: ['mongodb-org-server']
     - php: 7.1
-      env: DRIVER_VERSION=stable SERVER_VERSION=3.4
+      env: DRIVER_VERSION=stable
+      addons:
+        apt:
+          sources:
+            - sourceline: "deb [arch=amd64] https://repo.mongodb.org/apt/ubuntu precise/mongodb-org/3.4 multiverse"
+              key_url: "https://www.mongodb.org/static/pgp/server-3.4.asc"
+            - "mongodb-upstart"
+          packages: ['mongodb-org-server']
+    - php: 7.2
+      env: DRIVER_VERSION=stable
       addons:
         apt:
           sources:

+ 1 - 1
lib/Alcaeus/MongoDbAdapter/Helper/ReadPreference.php

@@ -110,7 +110,7 @@ trait ReadPreference
                 return false;
         }
 
-        if ($readPreference == \MongoClient::RP_PRIMARY && count($tags)) {
+        if ($readPreference == \MongoClient::RP_PRIMARY && !empty($tags)) {
             trigger_error("You can't use read preference tags with a read preference of PRIMARY", E_USER_WARNING);
             return false;
         }