Fix up Reflection.

Author: dereuromark

src/Method/AssociationTableMixinClassReflectionExtension.php

@@ -48,17 +48,23 @@ protected function getTableReflection(): ClassReflection
      */
     public function hasMethod(ClassReflection $classReflection, string $methodName): bool
     {
-        // magic findBy* method
-        if ($classReflection->is(Table::class) && preg_match('/^find(?:\w+)?By/', $methodName) > 0) {
-            return true;
+        // Check if it's a native method first, before treating as magic
+        if ($classReflection->is(Table::class)) {
+            if ($classReflection->hasNativeMethod($methodName)) {
+                return false; // Let the native method be used
+            }
+            // magic findBy* method
+            if (preg_match('/^find\w*By/', $methodName) > 0) {
+                return true;
+            }
         }
 
         if (!$classReflection->is(Association::class)) {
             return false;
         }
 
         // magic findBy* method on Association
-        if (preg_match('/^find(?:\w+)?By/', $methodName) > 0) {
+        if (preg_match('/^find\w*By/', $methodName) > 0) {
             return true;
         }
 
@@ -72,16 +78,22 @@ public function hasMethod(ClassReflection $classReflection, string $methodName):
      */
     public function getMethod(ClassReflection $classReflection, string $methodName): MethodReflection
     {
-        // magic findBy* method
-        if ($classReflection->is(Table::class) && preg_match('/^find(?:\w+)?By/', $methodName) > 0) {
-            return new TableFindByPropertyMethodReflection($methodName, $classReflection);
+        // Check if it's a native method first, before treating as magic
+        if ($classReflection->is(Table::class)) {
+            if ($classReflection->hasNativeMethod($methodName)) {
+                return $classReflection->getNativeMethod($methodName);
+            }
+            // magic findBy* method
+            if (preg_match('/^find\w*By/', $methodName) > 0) {
+                return new TableFindByPropertyMethodReflection($methodName, $classReflection);
+            }
         }
 
         // magic findBy* method on Association
         $associationReflection = $this->reflectionProvider->getClass(Association::class);
         if (
             $classReflection->isSubclassOfClass($associationReflection)
-            && preg_match('/^find(?:\w+)?By/', $methodName) > 0
+            && preg_match('/^find\w*By/', $methodName) > 0
         ) {
             return new TableFindByPropertyMethodReflection($methodName, $this->getTableReflection());
         }

src/Method/TableFindByPropertyMethodReflection.php

@@ -210,7 +210,15 @@ public function hasSideEffects(): TrinaryLogic
     protected function getParams(string $method): array
     {
         $method = Inflector::underscore($method);
-        $fields = substr($method, 8);
+        // Extract the part after "find" and before "_by"
+        // Handles: findBy, findAllBy, findOrCreateBy, etc.
+        if (preg_match('/^find(?:_\w+)?_by_(.+)$/', $method, $matches) === 1) {
+            $fields = $matches[1];
+        } else {
+            // Fallback for simple cases
+            $fields = substr($method, 8);
+        }
+
         if (str_contains($fields, '_and_')) {
             return explode('_and_', $fields);
         }

tests/test_app/Model/Table/NotesTable.php

@@ -59,6 +59,9 @@ public function warning(): array
         $this->MyUsers->Articles->findByTitleAndActive('Test', true)->first();
         // Test findBy with Or operator
         $this->MyUsers->Articles->findByTitleOrActive('Test', true)->first();
+        // Test magic findOrCreateBy methods on Table (issue #55)
+        $noteQuery = $this->findOrCreateByNote('Test Note');
+        $noteQuery->first();
         $entity = $this->get(10, cache: 'my_cache');
         if ($entity->note === 'Test') {
             $entity = $this->newEmptyEntity();

tests/test_app/Model/Table/UsersTable.php

@@ -48,5 +48,9 @@ public function blockOld(): void
         // Test magic findBy methods on association (issue #51)
         $articleQuery = $this->Articles->findByTitle('Test');
         $articleQuery->first();
+        // Test actual (non-magic) findOrCreateBySku method with specific signature (issue #55)
+        // This should use the native method, not the magic method reflection
+        $article = $this->Articles->findOrCreateBySku('TEST-SKU', 'Test Article');
+        $article->set('title', 'Updated Title');
     }
 }

tests/test_app/Model/Table/VeryCustomize00009ArticlesTable.php

@@ -69,4 +69,22 @@ public function newSample()
             ],
         );
     }
+
+    /**
+     * Custom non-magic findOrCreateBySku method with specific signature
+     *
+     * @param string $sku
+     * @param string $foo
+     * @return \Cake\ORM\Entity
+     */
+    public function findOrCreateBySku(string $sku, string $foo): Entity
+    {
+        $entity = $this->findBySku($sku)->first();
+        if ($entity === null) {
+            $entity = $this->newEntity(['sku' => $sku] + ['foo' => $foo]);
+            $this->saveOrFail($entity);
+        }
+
+        return $entity;
+    }
 }