Replace deprecated methods

.travis.yml

@@ -1,9 +1,10 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
 
 install:
   - composer self-update

README.md

@@ -1,6 +1,10 @@
 # CakeSoftDelete plugin for CakePHP
 
-[![Build status](https://api.travis-ci.org/PGBI/cakephp3-soft-delete.png?branch=master)](https://travis-ci.org/PGBI/cakephp3-soft-delete)
+[![Build status](https://api.travis-ci.org/fredckl/cakephp3-soft-delete.png?branch=master)](https://travis-ci.org/fredckl/cakephp3-soft-delete)
+
+------------
+> Original source from [PGBI](https://github.com/pgbi/cakephp3-soft-delete)
+------------
 
 ## Purpose
 
@@ -18,7 +22,7 @@ You can install this plugin into your CakePHP application using [composer](http:
 Update your composer file to include this plugin:
 
 ```
-composer require pgbi/cakephp3-soft-delete "~1.0"
+composer require fredckl/cakephp3-soft-delete "~2.0"
 ```
 
 ## Configuration

composer.json

@@ -1,20 +1,20 @@
 {
-    "name": "pgbi/cakephp3-soft-delete",
+    "name": "fredckl/cakephp3-soft-delete",
     "description": "SoftDelete plugin for CakePHP",
     "keywords": ["cakephp", "cakephp 3", "plugin", "soft", "delete", "deletable"],
-    "homepage": "https://github.com/pgbi/cakephp3-soft-delete",
+    "homepage": "https://github.com/fredckl/cakephp3-soft-delete",
     "type": "cakephp-plugin",
     "license": "MIT",
     "support": {
-        "source": "https://github.com/pgbi/cakephp3-soft-delete"
+        "source": "https://github.com/fredckl/cakephp3-soft-delete"
     },
     "require": {
         "php": ">=5.4",
         "cakephp/plugin-installer": "*",
-        "cakephp/cakephp": "~3.0"
+        "cakephp/cakephp": "~3.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "*"
+        "phpunit/phpunit": "^5|^6"
     },
     "autoload": {
         "psr-4": {

src/Model/Table/SoftDeleteTrait.php

@@ -22,11 +22,11 @@ public function getSoftDeleteField()
             $field = 'deleted';
         }
 
-        if ($this->schema()->column($field) === null) {
+        if ($this->getSchema()->getColumn($field) === null) {
             throw new MissingColumnException(
                 __('Configured field `{0}` is missing from the table `{1}`.',
                     $field,
-                    $this->alias()
+                    $this->getAlias()
                 )
             );
         }
@@ -36,7 +36,7 @@ public function getSoftDeleteField()
 
     public function query()
     {
-        return new Query($this->connection(), $this);
+        return new Query($this->getConnection(), $this);
     }
 
     /**
@@ -57,7 +57,7 @@ protected function _processDelete($entity, $options)
             return false;
         }
 
-        $primaryKey = (array)$this->primaryKey();
+        $primaryKey = (array)$this->getPrimaryKey();
         if (!$entity->has($primaryKey)) {
             $msg = 'Deleting requires all primary key values.';
             throw new \InvalidArgumentException($msg);
@@ -125,7 +125,7 @@ public function hardDelete(EntityInterface $entity)
         if(!$this->delete($entity)) {
             return false;
         }
-        $primaryKey = (array)$this->primaryKey();
+        $primaryKey = (array)$this->getPrimaryKey();
         $query = $this->query();
         $conditions = (array)$entity->extract($primaryKey);
         $statement = $query->delete()

src/ORM/Query.php

@@ -22,7 +22,7 @@ public function triggerBeforeFind()
         if (!$this->_beforeFindFired && $this->_type === 'select') {
             parent::triggerBeforeFind();
 
-            $repository = $this->repository();
+            $repository = $this->getRepository();
             $options = $this->getOptions();
 
             if (!is_array($options) || !in_array('withDeleted', $options)) {

tests/TestCase/Model/Table/SoftDeleteTraitTest.php

@@ -20,10 +20,10 @@ class SoftDeleteBehaviorTest extends TestCase
      * @var array
      */
     public $fixtures = [
-        'plugin.SoftDelete.users',
-        'plugin.SoftDelete.posts',
-        'plugin.SoftDelete.tags',
-        'plugin.SoftDelete.posts_tags'
+        'plugin.SoftDelete.Users',
+        'plugin.SoftDelete.Posts',
+        'plugin.SoftDelete.Tags',
+        'plugin.SoftDelete.PostsTags'
     ];
 
     /**
@@ -86,7 +86,7 @@ public function testFindWithOrWhere()
         $user = $this->usersTable->get(2);
         $this->usersTable->delete($user);
 
-        $query = $this->usersTable->find()->where(['id' => 1])->orWhere(['id' => 2]);
+        $query = $this->usersTable->find()->where(['OR' => [['id' => 1], ['id' => 2]]]);
         $this->assertEquals(1, $query->count());
     }
 

tests/bootstrap.php

@@ -1,4 +1,4 @@
-<?php
+ <?php
 use Cake\Cache\Cache;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
@@ -52,7 +52,7 @@
     'defaults' => 'php'
 ]);
 
-Cache::config([
+Cache::setConfig([
     '_cake_core_' => [
         'engine' => 'File',
         'prefix' => 'cake_core_',
@@ -76,7 +76,7 @@
     putenv('db_dsn=sqlite::memory:');
 }
 
-ConnectionManager::config('test', [
+ConnectionManager::setConfig('test', [
     'className' => 'Cake\Database\Connection',
     'driver' => getenv('db_class'),
     'dsn' => getenv('db_dsn'),
@@ -86,7 +86,7 @@
     'timezone' => 'UTC'
 ]);
 
-Log::config([
+Log::setConfig([
     'debug' => [
         'engine' => 'Cake\Log\Engine\FileLog',
         'levels' => ['notice', 'info', 'debug'],