Browse Source

Merge pull request #6286 from cakephp/relax-types

Relax typehints in FixtureManager.
José Lorenzo Rodríguez 11 years ago
parent
commit
bdd170425c
2 changed files with 2 additions and 1 deletions
  1. 1 0
      src/ORM/Marshaller.php
  2. 1 1
      src/TestSuite/Fixture/FixtureManager.php

+ 1 - 0
src/ORM/Marshaller.php

@@ -237,6 +237,7 @@ class Marshaller
      * * associated: Associations listed here will be marshalled as well.
      * * fieldList: A whitelist of fields to be assigned to the entity. If not present,
      *   the accessible fields list in the entity will be used.
+     * * accessibleFields: A list of fields to allow or deny in entity accessible fields.
      *
      * @param array $data The data to hydrate.
      * @param array $options List of options

+ 1 - 1
src/TestSuite/Fixture/FixtureManager.php

@@ -191,7 +191,7 @@ class FixtureManager
      * @param bool $drop whether drop the fixture if it is already created or not
      * @return void
      */
-    protected function _setupTable(TestFixture $fixture, Connection $db, array $sources, $drop = true)
+    protected function _setupTable($fixture, $db, array $sources, $drop = true)
     {
         if (!empty($fixture->created) && in_array($db->configName(), $fixture->created)) {
             return;