Merge pull request #257 from davidyell/develop

Merge for release
davidyell · Apr 17, 2018 · a96b6de · a96b6de
2 parents e7894b0 + c9013b4
commit a96b6de
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 82 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
 	},
   	"require-dev": {
 	  "phpunit/phpunit": "^5.5",
-	  "cakephp/cakephp": "~3.0",
+	  "cakephp/cakephp": "^3.4.0",
 	  "cakephp/cakephp-codesniffer": "^2.0"
 	},
 	"autoload": {

diff --git a/src/Database/Type/FileType.php b/src/Database/Type/FileType.php
@@ -11,9 +11,9 @@
 
 namespace Proffer\Database\Type;
 
-use Cake\Database\Type;
+use Cake\Database\Type\StringType;
 
-class FileType extends Type
+class FileType extends StringType
 {
     /**
      * Prevent the marhsaller changing the upload array into a string

diff --git a/src/Lib/ProfferPath.php b/src/Lib/ProfferPath.php
@@ -43,7 +43,7 @@ public function __construct(Table $table, Entity $entity, $field, array $setting
             $this->setRoot(WWW_ROOT . 'files');
         }
 
-        $this->setTable($table->alias());
+        $this->setTable($table->getAlias());
         $this->setField($field);
         $this->setSeed($this->generateSeed($entity->get($settings['dir'])));
 

diff --git a/src/Model/Behavior/ProfferBehavior.php b/src/Model/Behavior/ProfferBehavior.php
@@ -35,11 +35,11 @@ class ProfferBehavior extends Behavior
     public function initialize(array $config)
     {
         Type::map('proffer.file', '\Proffer\Database\Type\FileType');
-        $schema = $this->_table->schema();
-        foreach (array_keys($this->config()) as $field) {
-            $schema->columnType($field, 'proffer.file');
+        $schema = $this->_table->getSchema();
+        foreach (array_keys($this->getConfig()) as $field) {
+            $schema->setColumnType($field, 'proffer.file');
         }
-        $this->_table->schema($schema);
+        $this->_table->setSchema($schema);
     }
 
     /**
@@ -55,8 +55,8 @@ public function initialize(array $config)
      */
     public function beforeMarshal(Event $event, ArrayObject $data, ArrayObject $options)
     {
-        foreach ($this->config() as $field => $settings) {
-            if ($this->_table->validator()->isEmptyAllowed($field, false) &&
+        foreach ($this->getConfig() as $field => $settings) {
+            if ($this->_table->getValidator()->isEmptyAllowed($field, false) &&
                 isset($data[$field]['error']) && $data[$field]['error'] === UPLOAD_ERR_NO_FILE
             ) {
                 unset($data[$field]);
@@ -81,8 +81,8 @@ public function beforeMarshal(Event $event, ArrayObject $data, ArrayObject $opti
     public function beforeSave(Event $event, EntityInterface $entity, ArrayObject $options, ProfferPathInterface $path = null)
     {
 
-        foreach ($this->config() as $field => $settings) {
-            $tableEntityClass = $this->_table->entityClass();
+        foreach ($this->getConfig() as $field => $settings) {
+            $tableEntityClass = $this->_table->getEntityClass();
 
             if ($entity->has($field) && is_array($entity->get($field)) && $entity->get($field)['error'] === UPLOAD_ERR_OK) {
                 $this->process($field, $settings, $entity, $path);
@@ -169,7 +169,7 @@ protected function createPath(EntityInterface $entity, $field, array $settings,
         }
 
         $event = new Event('Proffer.afterPath', $entity, ['path' => $path]);
-        $this->_table->eventManager()->dispatch($event);
+        $this->_table->getEventManager()->dispatch($event);
         if (!empty($event->result)) {
             $path = $event->result;
         }
@@ -210,7 +210,7 @@ protected function createThumbnails(EntityInterface $entity, array $settings, Pr
 
             $eventData = ['path' => $path, 'images' => $imagePaths];
             $event = new Event('Proffer.afterCreateImage', $entity, $eventData);
-            $this->_table->eventManager()->dispatch($event);
+            $this->_table->getEventManager()->dispatch($event);
         }
     }
 
@@ -228,7 +228,7 @@ protected function createThumbnails(EntityInterface $entity, array $settings, Pr
      */
     public function afterDelete(Event $event, EntityInterface $entity, ArrayObject $options, ProfferPathInterface $path = null)
     {
-        foreach ($this->config() as $field => $settings) {
+        foreach ($this->getConfig() as $field => $settings) {
             $dir = $entity->get($settings['dir']);
 
             if (!empty($entity) && !empty($dir)) {
@@ -239,7 +239,7 @@ public function afterDelete(Event $event, EntityInterface $entity, ArrayObject $
                 }
 
                 $event = new Event('Proffer.beforeDeleteFolder', $entity, ['path' => $path]);
-                $this->_table->eventManager()->dispatch($event);
+                $this->_table->getEventManager()->dispatch($event);
                 $path->deleteFiles($path->getFolder(), true);
             }
 

diff --git a/tests/Stubs/TestPath.php b/tests/Stubs/TestPath.php
@@ -21,7 +21,7 @@ public function __construct(Table $table, Entity $entity, $field, array $setting
     {
         $this->setRoot(TMP . 'ProfferTests');
 
-        $this->setTable($table->alias());
+        $this->setTable($table->getAlias());
         $this->setField($field);
         $this->setSeed('proffer_test');
 

diff --git a/tests/TestCase/Lib/ProfferPathTest.php b/tests/TestCase/Lib/ProfferPathTest.php
@@ -115,9 +115,9 @@ public function pathDataProvider()
     public function testConstructedFullPath($data, $expected)
     {
         $table = $this->getMockBuilder('Cake\ORM\Table')
-            ->setMethods(['alias'])
+            ->setMethods(['getAlias'])
             ->getMock();
-        $table->method('alias')
+        $table->method('getAlias')
             ->willReturn('ProfferTest');
 
         $entity = new Entity($data['entity']);
@@ -136,9 +136,9 @@ public function testConstructedFullPath($data, $expected)
     public function testGetFolder()
     {
         $table = $this->getMockBuilder('Cake\ORM\Table')
-            ->setMethods(['alias'])
+            ->setMethods(['getAlias'])
             ->getMock();
-        $table->method('alias')
+        $table->method('getAlias')
             ->willReturn('ProfferTest');
 
         $entity = new Entity([
@@ -165,9 +165,9 @@ public function testGetFolder()
     public function testPrefixes()
     {
         $table = $this->getMockBuilder('Cake\ORM\Table')
-            ->setMethods(['alias'])
+            ->setMethods(['getAlias'])
             ->getMock();
-        $table->method('alias')
+        $table->method('getAlias')
             ->willReturn('ProfferTest');
 
         $entity = new Entity([
@@ -194,9 +194,9 @@ public function testPrefixes()
     public function testDeleteFiles()
     {
         $table = $this->getMockBuilder('Cake\ORM\Table')
-            ->setMethods(['alias'])
+            ->setMethods(['getAlias'])
             ->getMock();
-        $table->method('alias')
+        $table->method('getAlias')
             ->willReturn('ProfferTest');
 
         $entity = new Entity([
@@ -220,7 +220,7 @@ public function testDeleteFiles()
 
         $path->expects($this->any())
             ->method('getFolder')
-            ->willReturn(TMP . 'ProfferTests' . DS . $table->alias() . DS . 'photo' . DS . 'proffer_test' . DS);
+            ->willReturn(TMP . 'ProfferTests' . DS . $table->getAlias() . DS . 'photo' . DS . 'proffer_test' . DS);
 
         $path = new ProfferPath($table, $entity, 'photo', $settings);
 
@@ -258,9 +258,9 @@ public function testDeleteFiles()
     public function testCreatingPathFolderWhichExists()
     {
         $table = $this->getMockBuilder('Cake\ORM\Table')
-            ->setMethods(['alias'])
+            ->setMethods(['getAlias'])
             ->getMock();
-        $table->method('alias')
+        $table->method('getAlias')
             ->willReturn('ProfferTest');
 
         $entity = new Entity([