Merge branch 'master' into dev

Author: ADmad

.travis.yml

@@ -13,33 +13,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; 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

@@ -154,12 +154,24 @@ public function getWebservice($name)
      * 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
      *
@@ -175,7 +187,8 @@ public function configName()
      *
      * @param bool|null $enable whether to turn logging on or disable it. Use null to read current value.
      * @return bool
-     * @deprecated 2.0.0 Use enableQueryLogging(), disableQueryLogging() and getQueryLogging() instead.
+     *
+     * @deprecated 1.4.0 Use enableQueryLogging()/disableQueryLogging()/isQueryLoggingEnabled() instead.
      */
     public function logQueries($enable = null)
     {
@@ -211,11 +224,11 @@ public function disableQueryLogging()
     }
 
     /**
-     * Get the current state of query logging for the driver
+     * Check if query logging is enabled.
      *
      * @return bool
      */
-    public function getQueryLogging()
+    public function isQueryLoggingEnabled()
     {
         return $this->_logQueries;
     }
@@ -258,7 +271,7 @@ public function __debugInfo()
         return [
             'client' => $this->getClient(),
             'logger' => $this->logger(),
-            'query_logging' => $this->getQueryLogging(),
+            'query_logging' => $this->isQueryLoggingEnabled(),
             '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;
 
 /**

src/Webservice/Webservice.php

@@ -213,7 +213,8 @@ public function describe($endpoint)
         $shortName = App::shortName(get_class($this), 'Webservice', 'Webservice');
         list($plugin, $name) = pluginSplit($shortName);
 
-        $schemaShortName = implode('.', array_filter([$plugin, Inflector::classify($endpoint)]));
+        $endpoint = Inflector::classify(str_replace('-', '_', $endpoint));
+        $schemaShortName = implode('.', array_filter([$plugin, $endpoint]));
         $schemaClassName = App::className($schemaShortName, 'Model/Endpoint/Schema', 'Schema');
         if ($schemaClassName) {
             return new $schemaClassName($endpoint);
@@ -340,7 +341,7 @@ protected function _createResource($resourceClass, array $properties = [])
      */
     protected function _logQuery(Query $query, LoggerInterface $logger)
     {
-        if (!$this->getDriver()->getQueryLogging()) {
+        if (!$this->getDriver()->isQueryLoggingEnabled()) {
             return;
         }
 

tests/TestCase/AbstractDriverTest.php

@@ -49,15 +49,15 @@ public function testEnableQueryLogging()
         $driver = new Test();
         $driver->enableQueryLogging();
 
-        $this->assertTrue($driver->getQueryLogging());
+        $this->assertTrue($driver->isQueryLoggingEnabled());
     }
 
     public function testDisableQueryLogging()
     {
         $driver = new Test();
         $driver->disableQueryLogging();
 
-        $this->assertFalse($driver->getQueryLogging());
+        $this->assertFalse($driver->isQueryLoggingEnabled());
     }
 
     public function testDebugInfo()

tests/TestCase/Webservice/WebserviceTest.php

@@ -84,13 +84,6 @@ public function testExecuteWithoutDriver()
         $webservice->execute($query);
     }
 
-    public function testExecuteLoggingWithoutLogger()
-    {
-        $query = new Query($this->webservice, new Endpoint());
-
-        $this->webservice->execute($query);
-    }
-
     public function testExecuteLoggingWithLogger()
     {
         $logger = $this->getMockBuilder('Cake\Log\Engine\ConsoleLog')
@@ -210,6 +203,15 @@ public function testTransformResults()
         $this->assertInstanceOf('\Muffin\Webservice\Model\Resource', $resources[0]);
     }
 
+    public function testDescribe()
+    {
+        $service = new TestWebservice();
+
+        $result = $service->describe('test');
+        $this->assertInstanceOf('\Muffin\Webservice\Model\Schema', $result);
+        $this->assertEquals('Test', $result->name());
+    }
+
     public function testDebugInfo()
     {
         $this->assertEquals([

tests/bootstrap.php

@@ -85,13 +85,8 @@
     ]
 ]);
 
-// Ensure default test connection is defined
-if (!getenv('db_dsn')) {
-    putenv('db_dsn=sqlite:/' . TMP . 'debug_kit_test.sqlite');
-}
-
 $config = [
-    'url' => getenv('db_dsn'),
+    'url' => 'sqlite:/' . TMP . 'webservice_test.sqlite',
     'timezone' => 'UTC',
 ];