Merge pull request #414 from othercorey/4.x-primarykey

4.x - Updated calls to TableSchema::primaryKey() to getPrimaryKey()
cakephp · Dec 16, 2019 · 93d080e · 93d080e
2 parents b010b0d + 55f539d
commit 93d080e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/View/Helper/MigrationHelper.php b/src/View/Helper/MigrationHelper.php
@@ -167,7 +167,7 @@ public function columns($table)
             $tableSchema = $this->schema($table);
         }
         $columns = [];
-        $tablePrimaryKeys = $tableSchema->primaryKey();
+        $tablePrimaryKeys = $tableSchema->getPrimaryKey();
         foreach ($tableSchema->columns() as $column) {
             if (in_array($column, $tablePrimaryKeys)) {
                 continue;
@@ -268,7 +268,7 @@ public function primaryKeys($table)
             $tableSchema = $this->schema($table);
         }
         $primaryKeys = [];
-        $tablePrimaryKeys = $tableSchema->primaryKey();
+        $tablePrimaryKeys = $tableSchema->getPrimaryKey();
         foreach ($tableSchema->columns() as $column) {
             if (in_array($column, $tablePrimaryKeys)) {
                 $primaryKeys[] = ['name' => $column, 'info' => $this->column($tableSchema, $column)];
@@ -292,7 +292,7 @@ public function hasUnsignedPrimaryKey($tables)
             if (!($table instanceof TableSchema)) {
                 $tableSchema = $this->schema($table);
             }
-            $tablePrimaryKeys = $tableSchema->primaryKey();
+            $tablePrimaryKeys = $tableSchema->getPrimaryKey();
 
             foreach ($tablePrimaryKeys as $primaryKey) {
                 $column = $tableSchema->getColumn($primaryKey);

diff --git a/tests/TestCase/MigrationsTest.php b/tests/TestCase/MigrationsTest.php
@@ -165,7 +165,7 @@ public function testMigrateAndRollback()
         $columns = $numbersTable->getSchema()->columns();
         $expected = ['id', 'number', 'radix'];
         $this->assertEquals($columns, $expected);
-        $primaryKey = $numbersTable->getSchema()->primaryKey();
+        $primaryKey = $numbersTable->getSchema()->getPrimaryKey();
         $this->assertEquals($primaryKey, ['id']);
 
         $lettersTable = TableRegistry::get('Letters', ['connection' => $this->Connection]);
@@ -174,7 +174,7 @@ public function testMigrateAndRollback()
         $this->assertEquals($expected, $columns);
         $idColumn = $lettersTable->getSchema()->getColumn('id');
         $this->assertEquals(true, $idColumn['autoIncrement']);
-        $primaryKey = $lettersTable->getSchema()->primaryKey();
+        $primaryKey = $lettersTable->getSchema()->getPrimaryKey();
         $this->assertEquals($primaryKey, ['id']);
 
         // Rollback last