Merge pull request #54 from AD7six/deprecations

Fix deprecation errors.

Author: ADmad

.travis.yml

@@ -2,9 +2,13 @@ language: php
 
 php:
   - 5.6
-  - 7.0
-  - 7.1
   - 7.2
+  - 7.3
+  - '7.4snapshot'
+
+services:
+  - postgresql
+  - mysql
 
 env:
   matrix:
@@ -21,31 +25,29 @@ matrix:
     - php: 5.6
       env: PREFER_LOWEST=1 DB=mysql db_dsn='mysql://[email protected]/cakephp_test'
 
-    - php: 7.1
+    - php: 7.2
       env: PHPCS=1 DEFAULT=0
 
-    - php: 7.1
+    - php: 7.2
       env: PHPSTAN=1 DEFAULT=0
 
 before_script:
-  - phpenv config-rm xdebug.ini
-
   - if [[ $PREFER_LOWEST != 1 ]]; then composer install --no-interaction --prefer-source; fi
   - if [[ $PREFER_LOWEST = 1 ]]; then composer update --no-interaction --prefer-source --prefer-lowest --prefer-stable; fi
 
   - if [[ $DB = 'mysql' ]]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi
   - if [[ $DB = 'pgsql' ]]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi
 
 script:
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.1 ]]; then vendor/bin/phpunit; fi
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.1 ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=clover.xml; fi
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.2 ]]; then vendor/bin/phpunit; fi
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.2 ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=clover.xml; fi
 
   - if [[ $PHPCS = 1 ]]; then vendor/bin/phpcs -p -n --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
 
-  - if [[ $PHPSTAN = 1 ]]; then composer require --dev phpstan/phpstan:^0.9 && vendor/bin/phpstan analyse -l 5 src; fi
+  - if [[ $PHPSTAN = 1 ]]; then composer require --dev phpstan/phpstan:^0.11 && vendor/bin/phpstan analyse src; fi
 
 after_success:
-- if [[ $DEFAULT = 1 && $DB = 'mysql' && $TRAVIS_PHP_VERSION = 7.1 ]]; then bash <(curl -s https://codecov.io/bash); fi
+- if [[ $DEFAULT = 1 && $DB = 'mysql' && $TRAVIS_PHP_VERSION = 7.2 ]]; then bash <(curl -s https://codecov.io/bash); fi
 
 notifications:
   email: false

phpstan.neon

@@ -0,0 +1,7 @@
+parameters:
+    level: 5
+    ignoreErrors:
+        -
+            message: "#^Call to function method_exists\\(\\) with 'Cake\\\\\\\\ORM\\\\\\\\Entity' and 'getVisible' will always evaluate to false\\.$#"
+            count: 1
+            path: src/Model/Behavior/ShadowTranslateBehavior.php

src/Model/Behavior/ShadowTranslateBehavior.php

@@ -7,6 +7,7 @@
 use Cake\Event\Event;
 use Cake\I18n\I18n;
 use Cake\ORM\Behavior\TranslateBehavior;
+use Cake\ORM\Entity;
 use Cake\ORM\Query;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
@@ -16,6 +17,13 @@
  */
 class ShadowTranslateBehavior extends TranslateBehavior
 {
+    /**
+     * Method to use to get visible properties
+     *
+     * @var string
+     */
+    protected $_visiblePropertiesMethod = 'visibleProperties';
+
     /**
      * Constructor
      *
@@ -44,6 +52,10 @@ public function __construct(Table $table, array $config = [])
             'hasOneAlias' => $tableAlias . 'Translation',
         ];
 
+        if (method_exists(Entity::class, 'getVisible')) {
+            $this->_visiblePropertiesMethod = 'getVisible';
+        }
+
         parent::__construct($table, $config);
     }
 
@@ -457,7 +469,7 @@ protected function _rowMapper($results, $locale)
 
             $translation = $row['translation'];
 
-            $keys = $hydrated ? $translation->visibleProperties() : array_keys($translation);
+            $keys = $hydrated ? $translation->{$this->_visiblePropertiesMethod}() : array_keys($translation);
 
             foreach ($keys as $field) {
                 if ($field === 'locale') {

tests/TestCase/Model/Behavior/ShadowTranslateBehaviorTest.php

@@ -14,12 +14,13 @@ class ShadowTranslateBehaviorTest extends TranslateBehaviorTest
 {
     public $fixtures = [
         'core.Articles',
-        'core.Authors',
-        'core.Comments',
-        'core.Tags',
         'core.ArticlesTags',
-        'core.SpecialTags',
+        'core.Authors',
         'core.Groups',
+        'core.SpecialTags',
+        'core.Tags',
+        'core.Comments',
+        'core.Translates',
         'plugin.ShadowTranslate.ArticlesTranslations',
         'plugin.ShadowTranslate.ArticlesMoreTranslations',
         'plugin.ShadowTranslate.AuthorsTranslations',

tests/bootstrap.php

@@ -31,7 +31,3 @@
 }
 
 require $root . '/vendor/cakephp/cakephp/tests/bootstrap.php';
-
-Plugin::load('ShadowTranslate', [
-    'path' => dirname(dirname(__FILE__)) . DS
-]);