Merge pull request #34 from globalis-ms/develop

version 1.0.1
globalis-ms · Jan 21, 2020 · 668fd66 · 668fd66
2 parents 0ce0fa0 + dd8802b
commit 668fd66
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,5 +1,5 @@
-# PHP PSR-2 Coding Standards
-# http://www.php-fig.org/psr/psr-2/
+# PHP PSR-12 Coding Standards
+# https://www.php-fig.org/psr/psr-12/
 
 root = true
 

diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,9 @@ sudo: false
 language: php
 
 php:
-    - 7.1
     - 7.2
     - 7.3
+    - 7.4
 
 cache:
     directories:

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "issues": "https://github.com/globalis-ms/wp-cubi-helpers/issues"
     },
     "require": {
-        "php": ">=7.1"
+        "php": ">=7.2"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.5.0"

diff --git a/composer.lock b/composer.lock
diff --git a/src/functions-debug.php b/src/functions-debug.php
@@ -31,7 +31,13 @@ function mysql_disable_nocache_mod()
  */
 function query_set_nocache(string $query): string
 {
-    return preg_replace('/SELECT(\s)/i', 'SELECT SQL_NO_CACHE$1', $query, 1);
+    $select_query = trim($query);
+
+    if (0 === stripos($select_query, 'SELECT ') && 0 !== stripos($select_query, 'SELECT SQL_NO_CACHE')) {
+        return 'SELECT SQL_NO_CACHE' . substr($select_query, 6);
+    }
+
+    return $query;
 }
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,9 +3,9 @@ sudo: false @@
     language: php
     php:
-        - 7.1
         - 7.2
         - 7.3
+        - 7.4
     cache:
         directories:
@@ Expand Down @@