From 73fcf3109501c32d75b3de4eb6595a687582906e Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Thu, 1 Jan 2015 16:06:50 +0100 Subject: [PATCH] Moved the Model namespace into ORM so it can be distributed easier Also moved ModelAwareTrait to Datasource it I think it makes more sense there --- phpunit.xml.dist | 1 - src/Console/Shell.php | 2 +- src/Controller/Controller.php | 2 +- .../Exception/MissingModelException.php | 2 +- src/{Model => Datasource}/ModelAwareTrait.php | 4 ++-- src/{Model => ORM}/Behavior/CounterCacheBehavior.php | 2 +- src/{Model => ORM}/Behavior/TimestampBehavior.php | 2 +- src/{Model => ORM}/Behavior/Translate/TranslateTrait.php | 2 +- src/{Model => ORM}/Behavior/TranslateBehavior.php | 2 +- src/{Model => ORM}/Behavior/TreeBehavior.php | 2 +- src/ORM/BehaviorRegistry.php | 6 +++++- src/View/Cell.php | 2 +- tests/TestCase/DatabaseSuite.php | 1 - .../TestCase/{Model => Datasource}/ModelAwareTraitTest.php | 4 ++-- .../{Model => ORM}/Behavior/CounterCacheBehaviorTest.php | 4 ++-- .../{Model => ORM}/Behavior/TimestampBehaviorTest.php | 4 ++-- .../Behavior/Translate/TranslateTraitTest.php | 4 ++-- .../{Model => ORM}/Behavior/TranslateBehaviorTest.php | 6 +++--- tests/TestCase/{Model => ORM}/Behavior/TreeBehaviorTest.php | 4 ++-- 19 files changed, 29 insertions(+), 27 deletions(-) rename src/{Model => Datasource}/Exception/MissingModelException.php (95%) rename src/{Model => Datasource}/ModelAwareTrait.php (97%) rename src/{Model => ORM}/Behavior/CounterCacheBehavior.php (99%) rename src/{Model => ORM}/Behavior/TimestampBehavior.php (99%) rename src/{Model => ORM}/Behavior/Translate/TranslateTrait.php (97%) rename src/{Model => ORM}/Behavior/TranslateBehavior.php (99%) rename src/{Model => ORM}/Behavior/TreeBehavior.php (99%) rename tests/TestCase/{Model => Datasource}/ModelAwareTraitTest.php (97%) rename tests/TestCase/{Model => ORM}/Behavior/CounterCacheBehaviorTest.php (99%) rename tests/TestCase/{Model => ORM}/Behavior/TimestampBehaviorTest.php (99%) rename tests/TestCase/{Model => ORM}/Behavior/Translate/TranslateTraitTest.php (96%) rename tests/TestCase/{Model => ORM}/Behavior/TranslateBehaviorTest.php (99%) rename tests/TestCase/{Model => ORM}/Behavior/TreeBehaviorTest.php (99%) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 5e3eafbd936..88a07cbfe27 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -16,7 +16,6 @@ ./tests/TestCase/ - ./tests/TestCase/Model/ ./tests/TestCase/Database/ ./tests/TestCase/ORM/ diff --git a/src/Console/Shell.php b/src/Console/Shell.php index 671f40b6791..0775ef77029 100644 --- a/src/Console/Shell.php +++ b/src/Console/Shell.php @@ -18,9 +18,9 @@ use Cake\Console\Exception\ConsoleException; use Cake\Core\Configure; use Cake\Core\Plugin; +use Cake\Datasource\ModelAwareTrait; use Cake\Filesystem\File; use Cake\Log\LogTrait; -use Cake\Model\ModelAwareTrait; use Cake\Utility\Inflector; use Cake\Utility\MergeVariablesTrait; use Cake\Utility\String; diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php index 6a73c69d144..1798e05db53 100644 --- a/src/Controller/Controller.php +++ b/src/Controller/Controller.php @@ -15,11 +15,11 @@ namespace Cake\Controller; use Cake\Controller\Exception\MissingActionException; +use Cake\Datasource\ModelAwareTrait; use Cake\Event\Event; use Cake\Event\EventListenerInterface; use Cake\Event\EventManagerTrait; use Cake\Log\LogTrait; -use Cake\Model\ModelAwareTrait; use Cake\Network\Request; use Cake\Network\Response; use Cake\ORM\TableRegistry; diff --git a/src/Model/Exception/MissingModelException.php b/src/Datasource/Exception/MissingModelException.php similarity index 95% rename from src/Model/Exception/MissingModelException.php rename to src/Datasource/Exception/MissingModelException.php index aa2f402b1ee..ece14d95bf1 100644 --- a/src/Model/Exception/MissingModelException.php +++ b/src/Datasource/Exception/MissingModelException.php @@ -12,7 +12,7 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Model\Exception; +namespace Cake\Datasource\Exception; use Cake\Core\Exception\Exception; diff --git a/src/Model/ModelAwareTrait.php b/src/Datasource/ModelAwareTrait.php similarity index 97% rename from src/Model/ModelAwareTrait.php rename to src/Datasource/ModelAwareTrait.php index 1a532727bfa..1fd84396ef7 100644 --- a/src/Model/ModelAwareTrait.php +++ b/src/Datasource/ModelAwareTrait.php @@ -12,9 +12,9 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Model; +namespace Cake\Datasource; -use Cake\Model\Exception\MissingModelException; +use Cake\Datasource\Exception\MissingModelException; use InvalidArgumentException; /** diff --git a/src/Model/Behavior/CounterCacheBehavior.php b/src/ORM/Behavior/CounterCacheBehavior.php similarity index 99% rename from src/Model/Behavior/CounterCacheBehavior.php rename to src/ORM/Behavior/CounterCacheBehavior.php index 9582935351d..0458bd0c870 100644 --- a/src/Model/Behavior/CounterCacheBehavior.php +++ b/src/ORM/Behavior/CounterCacheBehavior.php @@ -12,7 +12,7 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Model\Behavior; +namespace Cake\ORM\Behavior; use Cake\Event\Event; use Cake\ORM\Association; diff --git a/src/Model/Behavior/TimestampBehavior.php b/src/ORM/Behavior/TimestampBehavior.php similarity index 99% rename from src/Model/Behavior/TimestampBehavior.php rename to src/ORM/Behavior/TimestampBehavior.php index 1ca1d6300f9..401cfe5f497 100644 --- a/src/Model/Behavior/TimestampBehavior.php +++ b/src/ORM/Behavior/TimestampBehavior.php @@ -12,7 +12,7 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Model\Behavior; +namespace Cake\ORM\Behavior; use Cake\Event\Event; use Cake\I18n\Time; diff --git a/src/Model/Behavior/Translate/TranslateTrait.php b/src/ORM/Behavior/Translate/TranslateTrait.php similarity index 97% rename from src/Model/Behavior/Translate/TranslateTrait.php rename to src/ORM/Behavior/Translate/TranslateTrait.php index 5b7482e5cdb..8f97251c708 100644 --- a/src/Model/Behavior/Translate/TranslateTrait.php +++ b/src/ORM/Behavior/Translate/TranslateTrait.php @@ -12,7 +12,7 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Model\Behavior\Translate; +namespace Cake\ORM\Behavior\Translate; use Cake\ORM\Entity; diff --git a/src/Model/Behavior/TranslateBehavior.php b/src/ORM/Behavior/TranslateBehavior.php similarity index 99% rename from src/Model/Behavior/TranslateBehavior.php rename to src/ORM/Behavior/TranslateBehavior.php index 2a290b42313..1734633d896 100644 --- a/src/Model/Behavior/TranslateBehavior.php +++ b/src/ORM/Behavior/TranslateBehavior.php @@ -12,7 +12,7 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Model\Behavior; +namespace Cake\ORM\Behavior; use ArrayObject; use Cake\Collection\Collection; diff --git a/src/Model/Behavior/TreeBehavior.php b/src/ORM/Behavior/TreeBehavior.php similarity index 99% rename from src/Model/Behavior/TreeBehavior.php rename to src/ORM/Behavior/TreeBehavior.php index 949a8e913aa..b5c5b8ef4d8 100644 --- a/src/Model/Behavior/TreeBehavior.php +++ b/src/ORM/Behavior/TreeBehavior.php @@ -12,7 +12,7 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Model\Behavior; +namespace Cake\ORM\Behavior; use Cake\Datasource\Exception\RecordNotFoundException; use Cake\Event\Event; diff --git a/src/ORM/BehaviorRegistry.php b/src/ORM/BehaviorRegistry.php index 3a80802a91b..be2733bdbf7 100644 --- a/src/ORM/BehaviorRegistry.php +++ b/src/ORM/BehaviorRegistry.php @@ -76,7 +76,11 @@ public function __construct(Table $table) */ protected function _resolveClassName($class) { - return App::className($class, 'Model/Behavior', 'Behavior'); + $result = App::className($class, 'Model/Behavior', 'Behavior'); + if (!$result && in_array($class, ['CounterCache', 'Timestamp', 'Tree', 'Translate'])) { + return 'Cake\ORM\Behavior\\' . $class . 'Behavior'; + } + return $result; } /** diff --git a/src/View/Cell.php b/src/View/Cell.php index 3eefe322424..9642819d7db 100644 --- a/src/View/Cell.php +++ b/src/View/Cell.php @@ -14,9 +14,9 @@ */ namespace Cake\View; +use Cake\Datasource\ModelAwareTrait; use Cake\Event\EventManager; use Cake\Event\EventManagerTrait; -use Cake\Model\ModelAwareTrait; use Cake\Network\Request; use Cake\Network\Response; use Cake\Utility\Inflector; diff --git a/tests/TestCase/DatabaseSuite.php b/tests/TestCase/DatabaseSuite.php index f4fe91b02b1..07e97ee6d20 100644 --- a/tests/TestCase/DatabaseSuite.php +++ b/tests/TestCase/DatabaseSuite.php @@ -38,7 +38,6 @@ public static function suite() $suite->addTestFile(__DIR__ . DS . 'Database' . DS . 'ConnectionTest.php'); $suite->addTestDirectoryRecursive(__DIR__ . DS . 'Database'); $suite->addTestDirectoryRecursive(__DIR__ . DS . 'ORM'); - $suite->addTestDirectoryRecursive(__DIR__ . DS . 'Model'); return $suite; } diff --git a/tests/TestCase/Model/ModelAwareTraitTest.php b/tests/TestCase/Datasource/ModelAwareTraitTest.php similarity index 97% rename from tests/TestCase/Model/ModelAwareTraitTest.php rename to tests/TestCase/Datasource/ModelAwareTraitTest.php index 2c4516bc95b..f7e0c196e9c 100644 --- a/tests/TestCase/Model/ModelAwareTraitTest.php +++ b/tests/TestCase/Datasource/ModelAwareTraitTest.php @@ -11,9 +11,9 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Test\TestCase\Model; +namespace Cake\Test\TestCase\Datasource; -use Cake\Model\ModelAwareTrait; +use Cake\Datasource\ModelAwareTrait; use Cake\TestSuite\TestCase; /** diff --git a/tests/TestCase/Model/Behavior/CounterCacheBehaviorTest.php b/tests/TestCase/ORM/Behavior/CounterCacheBehaviorTest.php similarity index 99% rename from tests/TestCase/Model/Behavior/CounterCacheBehaviorTest.php rename to tests/TestCase/ORM/Behavior/CounterCacheBehaviorTest.php index ad30ae4222f..3af41ef12c7 100644 --- a/tests/TestCase/Model/Behavior/CounterCacheBehaviorTest.php +++ b/tests/TestCase/ORM/Behavior/CounterCacheBehaviorTest.php @@ -12,12 +12,12 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Test\TestCase\Model\Behavior; +namespace Cake\Test\TestCase\ORM\Behavior; use Cake\Database\Query; use Cake\Datasource\ConnectionManager; use Cake\Event\Event; -use Cake\Model\Behavior\CounterCacheBehavior; +use Cake\ORM\Behavior\CounterCacheBehavior; use Cake\ORM\Entity; use Cake\ORM\Table; use Cake\ORM\TableRegistry; diff --git a/tests/TestCase/Model/Behavior/TimestampBehaviorTest.php b/tests/TestCase/ORM/Behavior/TimestampBehaviorTest.php similarity index 99% rename from tests/TestCase/Model/Behavior/TimestampBehaviorTest.php rename to tests/TestCase/ORM/Behavior/TimestampBehaviorTest.php index ae6a3cfb3d8..91f3e02a1e0 100644 --- a/tests/TestCase/Model/Behavior/TimestampBehaviorTest.php +++ b/tests/TestCase/ORM/Behavior/TimestampBehaviorTest.php @@ -12,11 +12,11 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Test\TestCase\Model\Behavior; +namespace Cake\Test\TestCase\ORM\Behavior; use Cake\Event\Event; use Cake\I18n\Time; -use Cake\Model\Behavior\TimestampBehavior; +use Cake\ORM\Behavior\TimestampBehavior; use Cake\ORM\Entity; use Cake\ORM\TableRegistry; use Cake\TestSuite\TestCase; diff --git a/tests/TestCase/Model/Behavior/Translate/TranslateTraitTest.php b/tests/TestCase/ORM/Behavior/Translate/TranslateTraitTest.php similarity index 96% rename from tests/TestCase/Model/Behavior/Translate/TranslateTraitTest.php rename to tests/TestCase/ORM/Behavior/Translate/TranslateTraitTest.php index 28f428b4e47..40e7911243e 100644 --- a/tests/TestCase/Model/Behavior/Translate/TranslateTraitTest.php +++ b/tests/TestCase/ORM/Behavior/Translate/TranslateTraitTest.php @@ -12,9 +12,9 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Test\TestCase\Model\Behavior\Translate; +namespace Cake\Test\TestCase\ORM\Behavior\Translate; -use Cake\Model\Behavior\Translate\TranslateTrait; +use Cake\ORM\Behavior\Translate\TranslateTrait; use Cake\ORM\Entity; use Cake\TestSuite\TestCase; diff --git a/tests/TestCase/Model/Behavior/TranslateBehaviorTest.php b/tests/TestCase/ORM/Behavior/TranslateBehaviorTest.php similarity index 99% rename from tests/TestCase/Model/Behavior/TranslateBehaviorTest.php rename to tests/TestCase/ORM/Behavior/TranslateBehaviorTest.php index edd2fd2595e..80b5f696f51 100644 --- a/tests/TestCase/Model/Behavior/TranslateBehaviorTest.php +++ b/tests/TestCase/ORM/Behavior/TranslateBehaviorTest.php @@ -12,13 +12,13 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Test\TestCase\Model\Behavior; +namespace Cake\Test\TestCase\ORM\Behavior; use Cake\Collection\Collection; use Cake\Event\Event; use Cake\I18n\I18n; -use Cake\Model\Behavior\TranslateBehavior; -use Cake\Model\Behavior\Translate\TranslateTrait; +use Cake\ORM\Behavior\TranslateBehavior; +use Cake\ORM\Behavior\Translate\TranslateTrait; use Cake\ORM\Entity; use Cake\ORM\TableRegistry; use Cake\TestSuite\TestCase; diff --git a/tests/TestCase/Model/Behavior/TreeBehaviorTest.php b/tests/TestCase/ORM/Behavior/TreeBehaviorTest.php similarity index 99% rename from tests/TestCase/Model/Behavior/TreeBehaviorTest.php rename to tests/TestCase/ORM/Behavior/TreeBehaviorTest.php index c0072a90c7c..00a2b6e8a2b 100644 --- a/tests/TestCase/Model/Behavior/TreeBehaviorTest.php +++ b/tests/TestCase/ORM/Behavior/TreeBehaviorTest.php @@ -12,11 +12,11 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Test\TestCase\Model\Behavior; +namespace Cake\Test\TestCase\ORM\Behavior; use Cake\Collection\Collection; use Cake\Event\Event; -use Cake\Model\Behavior\TranslateBehavior; +use Cake\ORM\Behavior\TranslateBehavior; use Cake\ORM\Entity; use Cake\ORM\TableRegistry; use Cake\TestSuite\TestCase;