Merge pull request #5528 from cakephp/3.0-move-model

Moved the Model namespace into ORM so it can be distributed easier

phpunit.xml.dist

@@ -16,7 +16,6 @@
 		<testsuite name="CakePHP Test Suite">
 			<directory>./tests/TestCase/</directory>
 			<!-- Excludes are required in order to let DatabaseSuite decorate the tests -->
-			<exclude>./tests/TestCase/Model/</exclude>
 			<exclude>./tests/TestCase/Database/</exclude>
 			<exclude>./tests/TestCase/ORM/</exclude>
 		</testsuite>

src/Console/Shell.php

@@ -18,9 +18,9 @@ use Cake\Console\ConsoleIo;
 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;

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;

src/Model/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;
 

src/Model/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;
 
 /**

src/Model/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;

src/Model/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;

src/Model/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;
 

src/Model/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;

src/Model/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;

src/ORM/BehaviorRegistry.php

@@ -76,7 +76,11 @@ class BehaviorRegistry extends ObjectRegistry
      */
     protected function _resolveClassName($class)
     {
-        return App::className($class, 'Model/Behavior', 'Behavior');
+        $result = App::className($class, 'Model/Behavior', 'Behavior');
+        if (!$result) {
+            $result = App::className($class, 'ORM/Behavior', 'Behavior');
+        }
+        return $result;
     }
 
     /**

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;

tests/TestCase/DatabaseSuite.php

@@ -38,7 +38,6 @@ class DatabaseSuite extends TestSuite
         $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;
     }
 

tests/TestCase/Model/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;
 
 /**
@@ -96,7 +96,7 @@ class ModelAwareTraitTest extends TestCase
      * test MissingModelException being thrown
      *
      * @return void
-     * @expectedException \Cake\Model\Exception\MissingModelException
+     * @expectedException \Cake\Datasource\Exception\MissingModelException
      * @expectedExceptionMessage Model class "Magic" of type "Test" could not be found.
      */
     public function testMissingModelException()

tests/TestCase/Model/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;

tests/TestCase/Model/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;

tests/TestCase/Model/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;
 

tests/TestCase/Model/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;

tests/TestCase/Model/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;