Merge pull request #81 from UseMuffin/cake-3.7

Add new methods to fix errors with DebugKit on Cake 3.7.

Author: ADmad

.travis.yml

@@ -2,7 +2,6 @@ language: php
 
 php:
   - 7.0
-  - 7.2
   - 7.1
   - 5.6
 
@@ -13,33 +12,40 @@ sudo: false
 env:
   global:
     - DEFAULT=1
+    - CODECOVERAGE=0
 
 matrix:
   fast_finish: true
 
   include:
+    - php: 7.2
+      env: CODECOVERAGE=1 DEFAULT=0
+
     - php: 7.0
       env: PHPCS=1 DEFAULT=0
 
     - php: 7.0
       env: PHPSTAN=1 DEFAULT=0
 
+    - php: 5.6
+      env: PREFER_LOWEST=1
+
 before_script:
   - if [[ $TRAVIS_PHP_VERSION != 7.0 ]]; then phpenv config-rm xdebug.ini; fi
 
   - if [[ $PHPSTAN = 1 ]]; then composer require --dev phpstan/phpstan:^0.9; fi
   - if [[ $PHPSTAN != 1 ]]; then composer install --no-interaction; fi
 
 script:
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then ./vendor/bin/phpunit --coverage-clover=clover.xml; fi
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.0 ]]; then ./vendor/bin/phpunit; fi
+  - if [[ $CODECOVERAGE = 1 ]]; then ./vendor/bin/phpunit --coverage-clover=clover.xml; fi
+  - if [[ $DEFAULT = 1 ]]; then ./vendor/bin/phpunit; fi
 
   - if [[ $PHPCS = 1 ]]; then ./vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
 
   - if [[ $PHPSTAN = 1 ]]; then vendor/bin/phpstan analyse -l 2 src; fi
 
 after_success:
-- if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then bash <(curl -s https://codecov.io/bash); fi
+- if [[ $CODECOVERAGE = 1 ]]; then bash <(curl -s https://codecov.io/bash); fi
 
 notifications:
   email: false

src/AbstractDriver.php

@@ -6,7 +6,6 @@
 use Cake\Utility\Inflector;
 use Muffin\Webservice\Exception\MissingWebserviceClassException;
 use Muffin\Webservice\Exception\UnimplementedWebserviceMethodException;
-use Muffin\Webservice\Webservice\Webservice;
 use Muffin\Webservice\Webservice\WebserviceInterface;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
@@ -111,12 +110,24 @@ public function webservice($name, WebserviceInterface $webservice = null)
      * Returns a logger instance
      *
      * @return \Psr\Log\LoggerInterface
+     *
+     * @deprecated 1.4.0 Use getLogger() instead.
      */
     public function logger()
     {
         return $this->logger;
     }
 
+    /**
+     * Returns a logger instance
+     *
+     * @return \Psr\Log\LoggerInterface
+     */
+    public function getLogger()
+    {
+        return $this->logger;
+    }
+
     /**
      * Returns the connection name used in the configuration
      *
@@ -134,6 +145,8 @@ public function configName()
      *   Use null to read current value.
      *
      * @return bool
+     *
+     * @deprecated 1.4.0 Use enableQueryLogging()/disableQueryLogging()/isQueryLoggingEnabled() instead.
      */
     public function logQueries($enable = null)
     {
@@ -144,6 +157,40 @@ public function logQueries($enable = null)
         $this->_logQueries = $enable;
     }
 
+    /**
+     * Enable/disable query logging
+     *
+     * @return $this
+     */
+    public function enableQueryLogging()
+    {
+        $this->_logQueries = true;
+
+        return $this;
+    }
+
+    /**
+     * Disable query logging
+     *
+     * @return $this
+     */
+    public function disableQueryLogging()
+    {
+        $this->_logQueries = false;
+
+        return $this;
+    }
+
+    /**
+     * Check if query logging is enabled.
+     *
+     * @return bool
+     */
+    public function isQueryLoggingEnabled()
+    {
+        return $this->_logQueries;
+    }
+
     /**
      * Proxies the client's methods.
      *
@@ -183,7 +230,7 @@ public function __debugInfo()
     {
         return [
             'client' => $this->client(),
-            'logger' => $this->logger(),
+            'logger' => $this->getLogger(),
             'webservices' => array_keys($this->_webservices)
         ];
     }

src/Model/EndpointRegistry.php

@@ -5,7 +5,6 @@
 use Cake\Core\App;
 use Cake\Datasource\ConnectionManager;
 use Cake\Utility\Inflector;
-use Muffin\Webservice\AbstractDriver;
 use RuntimeException;
 
 class EndpointRegistry

src/Webservice/Webservice.php

@@ -3,16 +3,13 @@
 namespace Muffin\Webservice\Webservice;
 
 use Cake\Core\App;
-use Cake\Core\Configure;
-use Cake\Datasource\ConnectionInterface;
 use Cake\Utility\Inflector;
 use Cake\Utility\Text;
 use Muffin\Webservice\AbstractDriver;
 use Muffin\Webservice\Exception\MissingEndpointSchemaException;
 use Muffin\Webservice\Exception\UnimplementedWebserviceMethodException;
 use Muffin\Webservice\Model\Endpoint;
 use Muffin\Webservice\Query;
-use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 
 /**

tests/TestCase/Webservice/WebserviceTest.php

@@ -110,7 +110,7 @@ public function testExecuteLoggingWithLoggerEnabled()
             ->expects($this->once())
             ->method('debug');
 
-        $this->webservice->driver()->logQueries(true);
+        $this->webservice->driver()->enableQueryLogging();
         $this->webservice->driver()->setLogger($logger);
 
         $query = new Query($this->webservice, new Endpoint());