More new methods

Author: raul338

src/File/Path/Basepath/DefaultTrait.php

@@ -29,8 +29,8 @@ public function basepath()
 
         $replacements = [
             '{primaryKey}' => $this->entity->get($this->table->getPrimaryKey()),
-            '{model}' => $this->table->alias(),
-            '{table}' => $this->table->table(),
+            '{model}' => $this->table->getAlias(),
+            '{table}' => $this->table->getTable(),
             '{field}' => $this->field,
             '{year}' => date("Y"),
             '{month}' => date("m"),

tests/TestCase/File/Path/Basepath/DefaultTraitTest.php

@@ -17,7 +17,7 @@ public function testNoSpecialConfiguration()
         $mock->data = ['name' => 'filename'];
         $mock->field = 'field';
         $mock->entity->expects($this->once())->method('get')->will($this->returnValue(1));
-        $mock->table->expects($this->once())->method('alias')->will($this->returnValue('Table'));
+        $mock->table->expects($this->once())->method('getAlias')->will($this->returnValue('Table'));
         $mock->table->expects($this->once())->method('getPrimaryKey')->will($this->returnValue('id'));
         $this->assertEquals('webroot/files/Table/field/', $mock->basepath());
     }
@@ -31,7 +31,7 @@ public function testCustomPath()
         $mock->data = ['name' => 'filename'];
         $mock->field = 'field';
         $mock->entity->expects($this->once())->method('get')->will($this->returnValue(1));
-        $mock->table->expects($this->once())->method('alias')->will($this->returnValue('Table'));
+        $mock->table->expects($this->once())->method('getAlias')->will($this->returnValue('Table'));
         $mock->table->expects($this->once())->method('getPrimaryKey')->will($this->returnValue('id'));
         $this->assertEquals('webroot/files/Table-field/', $mock->basepath());
     }
@@ -45,7 +45,7 @@ public function testExistingEntityWithPrimaryKey()
         $mock->data = ['name' => 'filename'];
         $mock->field = 'field';
         $mock->entity->expects($this->once())->method('get')->will($this->returnValue(1));
-        $mock->table->expects($this->once())->method('alias')->will($this->returnValue('Table'));
+        $mock->table->expects($this->once())->method('getAlias')->will($this->returnValue('Table'));
         $mock->table->expects($this->exactly(2))->method('getPrimaryKey')->will($this->returnValue('id'));
         $this->assertEquals('webroot/files/Table-field/1/', $mock->basepath());
     }
@@ -113,7 +113,7 @@ public function testModelFieldYearWithMonthAndDayPath()
         $mock->data = ['name' => 'filename'];
         $mock->field = 'field';
         $mock->entity->expects($this->once())->method('get')->will($this->returnValue(1));
-        $mock->table->expects($this->once())->method('alias')->will($this->returnValue('Table'));
+        $mock->table->expects($this->once())->method('getAlias')->will($this->returnValue('Table'));
 
         $this->assertEquals('webroot/files/Table/field/' . date("Y") . '/' . date("m") . '/' . date("d") . '/', $mock->basepath());
     }
@@ -169,7 +169,7 @@ public function testFieldValue()
         $mock->data = ['name' => 'filename'];
         $mock->field = 'field';
         $mock->entity->expects($this->any())->method('get')->will($this->returnValue('value'));
-        $mock->table->expects($this->once())->method('alias')->will($this->returnValue('Table'));
+        $mock->table->expects($this->once())->method('getAlias')->will($this->returnValue('Table'));
         $this->assertEquals('webroot/files/Table/value/', $mock->basepath());
     }
 }