Merge pull request #17 from CakeDC/3.next-cake5-ar-fixes

Thank you.

Author: rochamarcelo

.semver

@@ -1,5 +1,5 @@
 ---
-:major: 2
+:major: 3
 :minor: 0
-:patch: 1
+:patch: 0
 :special: ''

README.md

@@ -1,4 +1,4 @@
-# CakePHP 4 extension for PHPStan
+# CakePHP 5 extension for PHPStan
 
 [![Build Status](https://secure.travis-ci.org/CakeDC/cakephp-phpstan.png?branch=master)](http://travis-ci.org/CakeDC/cakephp-phpstan)
 [![Downloads](https://poser.pugx.org/CakeDC/cakephp-phpstan/d/total.png)](https://packagist.org/packages/CakeDC/cakephp-phpstan)
@@ -12,19 +12,11 @@ This extension provides following features:
 
 1. Provide correct return type for `Cake\ORM\Locator\LocatorInterface::get()`
 1. Provide correct return type for `Cake\Controller\Controller::loadComponent()`
-1. Provide correct return type for `Cake\Controller\Controller::loadModel()`
-1. Provide correct return type for `Cake\Controller\Component::loadModel()`
-1. Provide correct return type for `Cake\Command\Command::loadModel()`
-1. Provide correct return type for `Cake\Console\Shell::loadModel()`
-1. Provide correct return type for `Cake\Mailer\Mailer::loadModel()`
-1. Provide correct return type for `Cake\View\Cell::loadModel()`
 1. Provide correct return type for `Cake\Controller\Controller::fetchTable()`
 1. Provide correct return type for `Cake\Controller\Component::fetchTable()`
 1. Provide correct return type for `Cake\Command\Command::fetchTable()`
-1. Provide correct return type for `Cake\Console\Shell::fetchTable()`
 1. Provide correct return type for `Cake\Mailer\Mailer::fetchTable()`
 1. Provide correct return type for `Cake\View\Cell::fetchTable()`
-1. Provide correct return type for `Cake\Console\Shell::helper()`
 1. Provide correct return type for `Cake\Console\ConsoleIo::helper()`
 
 ## Installation

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "cakedc/cakephp-phpstan",
-    "description": "CakePHP 4 plugin extension for PHPStan.",
+    "description": "CakePHP 5 plugin extension for PHPStan.",
     "type": "phpstan-extension",
     "license": "MIT",
     "authors": [

extension.neon

@@ -17,10 +17,6 @@ services:
 		factory: CakeDC\PHPStan\Type\TableLocatorDynamicReturnTypeExtension(Cake\Command\Command, fetchTable)
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
-	-
-		factory: CakeDC\PHPStan\Type\TableLocatorDynamicReturnTypeExtension(Cake\Console\Shell, fetchTable)
-		tags:
-			- phpstan.broker.dynamicMethodReturnTypeExtension
 	-
 		factory: CakeDC\PHPStan\Type\TableLocatorDynamicReturnTypeExtension(Cake\Mailer\Mailer, fetchTable)
 		tags:
@@ -37,30 +33,6 @@ services:
 		factory: CakeDC\PHPStan\Type\TableLocatorDynamicReturnTypeExtension(Cake\ORM\Locator\LocatorInterface, get)
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
-	-
-		factory: CakeDC\PHPStan\Type\TableLocatorDynamicReturnTypeExtension(Cake\Controller\Controller, loadModel)
-		tags:
-			- phpstan.broker.dynamicMethodReturnTypeExtension
-	-
-		factory: CakeDC\PHPStan\Type\TableLocatorDynamicReturnTypeExtension(Cake\Command\Command, loadModel)
-		tags:
-			- phpstan.broker.dynamicMethodReturnTypeExtension
-	-
-		factory: CakeDC\PHPStan\Type\TableLocatorDynamicReturnTypeExtension(Cake\Console\Shell, loadModel)
-		tags:
-			- phpstan.broker.dynamicMethodReturnTypeExtension
-	-
-		factory: CakeDC\PHPStan\Type\TableLocatorDynamicReturnTypeExtension(Cake\Mailer\Mailer, loadModel)
-		tags:
-			- phpstan.broker.dynamicMethodReturnTypeExtension
-	-
-		factory: CakeDC\PHPStan\Type\TableLocatorDynamicReturnTypeExtension(Cake\View\Cell, loadModel)
-		tags:
-			- phpstan.broker.dynamicMethodReturnTypeExtension
-	-
-		factory: CakeDC\PHPStan\Type\TableLocatorDynamicReturnTypeExtension(Cake\Controller\Component, loadModel)
-		tags:
-			- phpstan.broker.dynamicMethodReturnTypeExtension
 	-
 		class: CakeDC\PHPStan\Type\ComponentLoadDynamicReturnTypeExtension
 		tags:

src/Method/TableFindByPropertyMethodReflection.php

@@ -106,7 +106,7 @@ public function getName(): string
      */
     public function getReturnType(): ObjectType
     {
-        return new ObjectType('\Cake\ORM\Query');
+        return new ObjectType('\Cake\ORM\Query\SelectQuery');
     }
 
     /**