Merge pull request #47 from mkopinsky/isSubclassOf_CS

j0k3r · web-flow · commit 19ed44071669 · 2018-03-09T09:29:21.000+01:00
Use correct case for calls to ReflectionClass::isSubclassOf
diff --git a/lib/Doctrine/Cli.php b/lib/Doctrine/Cli.php
@@ -359,7 +359,7 @@ public function registerTaskClass($className)
     protected function classIsTask($className)
     {
         $reflectionClass = new ReflectionClass($className);
-        return (bool) $reflectionClass->isSubClassOf(self::TASK_BASE_CLASS);
+        return (bool) $reflectionClass->isSubclassOf(self::TASK_BASE_CLASS);
     }
 
     /**
diff --git a/lib/Doctrine/Core.php b/lib/Doctrine/Core.php
@@ -815,7 +815,7 @@ public static function isValidModelClass($class)
             // Skip the following classes
             // - abstract classes
             // - not a subclass of Doctrine_Record
-            if ( ! $class->isAbstract() && $class->isSubClassOf('Doctrine_Record')) {
+            if ( ! $class->isAbstract() && $class->isSubclassOf('Doctrine_Record')) {
 
                 return true;
             }
diff --git a/lib/Doctrine/Table.php b/lib/Doctrine/Table.php
@@ -356,7 +356,7 @@ public function initDefinition()
             }
             $ref = new ReflectionClass($parent);
 
-            if ($ref->isAbstract() || ! $class->isSubClassOf($parent)) {
+            if ($ref->isAbstract() || ! $class->isSubclassOf($parent)) {
                 continue;
             }
             $parentTable = $this->_conn->getTable($parent);
diff --git a/tests/Import/BuilderTestCase.php b/tests/Import/BuilderTestCase.php
@@ -50,36 +50,36 @@ public function testInheritanceGeneration()
         $schemaTestInheritanceChild1Table = new ReflectionClass('SchemaTestInheritanceChild1Table');
         $schemaTestInheritanceChild2Table = new ReflectionClass('SchemaTestInheritanceChild2Table');
 
-        $this->assertTrue($schemaTestInheritanceParent->isSubClassOf('Doctrine_Record'));
-        $this->assertTrue($schemaTestInheritanceParent->isSubClassOf('BaseSchemaTestInheritanceParent'));
-        $this->assertTrue($schemaTestInheritanceParent->isSubClassOf('PackageSchemaTestInheritanceParent'));
-        $this->assertTrue($schemaTestInheritanceChild1->isSubClassOf('BaseSchemaTestInheritanceChild1'));
-        $this->assertTrue($schemaTestInheritanceChild2->isSubClassOf('BaseSchemaTestInheritanceChild2'));
+        $this->assertTrue($schemaTestInheritanceParent->isSubclassOf('Doctrine_Record'));
+        $this->assertTrue($schemaTestInheritanceParent->isSubclassOf('BaseSchemaTestInheritanceParent'));
+        $this->assertTrue($schemaTestInheritanceParent->isSubclassOf('PackageSchemaTestInheritanceParent'));
+        $this->assertTrue($schemaTestInheritanceChild1->isSubclassOf('BaseSchemaTestInheritanceChild1'));
+        $this->assertTrue($schemaTestInheritanceChild2->isSubclassOf('BaseSchemaTestInheritanceChild2'));
         
-        $this->assertTrue($schemaTestInheritanceChild1->isSubClassOf('SchemaTestInheritanceParent'));
-        $this->assertTrue($schemaTestInheritanceChild1->isSubClassOf('BaseSchemaTestInheritanceParent'));
+        $this->assertTrue($schemaTestInheritanceChild1->isSubclassOf('SchemaTestInheritanceParent'));
+        $this->assertTrue($schemaTestInheritanceChild1->isSubclassOf('BaseSchemaTestInheritanceParent'));
         
-        $this->assertTrue($schemaTestInheritanceChild2->isSubClassOf('SchemaTestInheritanceParent'));
-        $this->assertTrue($schemaTestInheritanceChild2->isSubClassOf('BaseSchemaTestInheritanceParent'));
-        $this->assertTrue($schemaTestInheritanceChild2->isSubClassOf('SchemaTestInheritanceChild1'));
-        $this->assertTrue($schemaTestInheritanceChild2->isSubClassOf('BaseSchemaTestInheritanceChild1'));
-        $this->assertTrue($schemaTestInheritanceChild2->isSubClassOf('PackageSchemaTestInheritanceParent'));
+        $this->assertTrue($schemaTestInheritanceChild2->isSubclassOf('SchemaTestInheritanceParent'));
+        $this->assertTrue($schemaTestInheritanceChild2->isSubclassOf('BaseSchemaTestInheritanceParent'));
+        $this->assertTrue($schemaTestInheritanceChild2->isSubclassOf('SchemaTestInheritanceChild1'));
+        $this->assertTrue($schemaTestInheritanceChild2->isSubclassOf('BaseSchemaTestInheritanceChild1'));
+        $this->assertTrue($schemaTestInheritanceChild2->isSubclassOf('PackageSchemaTestInheritanceParent'));
 
-        $this->assertTrue($schemaTestInheritanceParentTable->isSubClassOf('Doctrine_Table'));
-        $this->assertTrue($schemaTestInheritanceChild1Table->isSubClassOf('SchemaTestInheritanceParentTable'));
-        $this->assertTrue($schemaTestInheritanceChild1Table->isSubClassOf('PackageSchemaTestInheritanceParentTable'));
+        $this->assertTrue($schemaTestInheritanceParentTable->isSubclassOf('Doctrine_Table'));
+        $this->assertTrue($schemaTestInheritanceChild1Table->isSubclassOf('SchemaTestInheritanceParentTable'));
+        $this->assertTrue($schemaTestInheritanceChild1Table->isSubclassOf('PackageSchemaTestInheritanceParentTable'));
 
-        $this->assertTrue($schemaTestInheritanceChild2Table->isSubClassOf('SchemaTestInheritanceParentTable'));
-        $this->assertTrue($schemaTestInheritanceChild2Table->isSubClassOf('PackageSchemaTestInheritanceParentTable'));
-        $this->assertTrue($schemaTestInheritanceChild2Table->isSubClassOf('SchemaTestInheritanceChild1Table'));
-        $this->assertTrue($schemaTestInheritanceChild2Table->isSubClassOf('PackageSchemaTestInheritanceChild1Table'));
+        $this->assertTrue($schemaTestInheritanceChild2Table->isSubclassOf('SchemaTestInheritanceParentTable'));
+        $this->assertTrue($schemaTestInheritanceChild2Table->isSubclassOf('PackageSchemaTestInheritanceParentTable'));
+        $this->assertTrue($schemaTestInheritanceChild2Table->isSubclassOf('SchemaTestInheritanceChild1Table'));
+        $this->assertTrue($schemaTestInheritanceChild2Table->isSubclassOf('PackageSchemaTestInheritanceChild1Table'));
 
         # Simple Inheritance
         $schemaTestSimpleInheritanceParent = new ReflectionClass('SchemaTestSimpleInheritanceParent');
         $schemaTestSimpleInheritanceChild = new ReflectionClass('SchemaTestSimpleInheritanceChild');
 
         $this->assertTrue($schemaTestSimpleInheritanceParent->hasMethod('setTableDefinition'));
-        $this->assertTrue($schemaTestSimpleInheritanceChild->isSubClassOf('SchemaTestSimpleInheritanceParent'));
+        $this->assertTrue($schemaTestSimpleInheritanceChild->isSubclassOf('SchemaTestSimpleInheritanceParent'));
 
         # Class Table Inheritance
         $schemaTestClassTableInheritanceParent = new ReflectionClass('SchemaTestClassTableInheritanceParent');

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ public function registerTaskClass($className)`
`359`	`359`	`protected function classIsTask($className)`
`360`	`360`	`{`
`361`	`361`	`$reflectionClass = new ReflectionClass($className);`
`362`		`- return (bool) $reflectionClass->isSubClassOf(self::TASK_BASE_CLASS);`
	`362`	`+ return (bool) $reflectionClass->isSubclassOf(self::TASK_BASE_CLASS);`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -815,7 +815,7 @@ public static function isValidModelClass($class)`
`815`	`815`	`// Skip the following classes`
`816`	`816`	`// - abstract classes`
`817`	`817`	`// - not a subclass of Doctrine_Record`
`818`		`- if ( ! $class->isAbstract() && $class->isSubClassOf('Doctrine_Record')) {`
	`818`	`+ if ( ! $class->isAbstract() && $class->isSubclassOf('Doctrine_Record')) {`
`819`	`819`
`820`	`820`	`return true;`
`821`	`821`	`}`
Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ public function initDefinition()`
`356`	`356`	`}`
`357`	`357`	`$ref = new ReflectionClass($parent);`
`358`	`358`
`359`		`- if ($ref->isAbstract() \|\| ! $class->isSubClassOf($parent)) {`
	`359`	`+ if ($ref->isAbstract() \|\| ! $class->isSubclassOf($parent)) {`
`360`	`360`	`continue;`
`361`	`361`	`}`
`362`	`362`	`$parentTable = $this->_conn->getTable($parent);`