fix deprecations #326
fix deprecations #326
Conversation
|
Had to bump up to |
|
But I still have no idea how we should handle the missing "correct" return-types of |
This reverts commit 689f6de.
src/Command/InfoCommand.php
Outdated
| @@ -79,7 +79,7 @@ public function execute(Arguments $args, ConsoleIo $io) { | |||
| $io->out(); | |||
|
|
|||
| $io->out('Total unfinished jobs: ' . $this->QueuedJobs->getLength()); | |||
| $this->loadModel('Queue.QueueProcesses'); | |||
| $this->QueueProcesses = $this->fetchTable('Queue.QueueProcesses'); | |||
There was a problem hiding this comment.
something must still be wrong, as PHPStan doesnt like it yet.
There was a problem hiding this comment.
I now replaced fetchTable() with getTableLocator()->get($tableName) since this for some reason pleases the PHPStan gods...
src/Migration/OldTaskFinder.php
Outdated
|
|
||
| $taskKey = $plugin ? $plugin . '.' . $name : $name; | ||
| $tasks[$taskKey] = $path . $r; | ||
| if ($res) { |
There was a problem hiding this comment.
instead of nesting, why not just glob() ?: [] ?
There was a problem hiding this comment.
Sorry, I am not really sure what you mean. How would glob() ?: [] help us here?
We still need the separate $tasks variable since we have to return some sort of array so this seems pretty fine to me.
There was a problem hiding this comment.
I think I get it now
src/Queue/TaskFinder.php
Outdated
| if (!in_array($className, $ignoredTasks, true)) { | ||
| $tasks[$key] = $className; | ||
| $files = glob($path . '*Task.php'); | ||
| if ($files) { |
src/Queue/Task.php
Outdated
| @@ -95,9 +95,10 @@ public function __construct(?Io $io = null, ?LoggerInterface $logger = null) { | |||
| $this->io = $io ?: new Io(new ConsoleIo()); | |||
| $this->logger = $logger; | |||
|
|
|||
| $this->loadModel($this->queueModelClass); | |||
| $tableLocator = $this->getTableLocator(); | |||
| $this->QueuedJobs = $tableLocator->get($this->queueModelClass); | |||
There was a problem hiding this comment.
Not really sure how we should tackle this. Should we remove that property, set it hardcoded as string and therefore remove the posibility to set a custom QueueModelClass?
There was a problem hiding this comment.
Could you please try the following? Not really sure if it would work.
/**
* @var \Queue\Model\Table\QueuedJobsTable
*/
$QueuedJobs = $tableLocator->get($this->queueModelClass);
$this->QueuedJobs = $QueuedJobs;
There was a problem hiding this comment.
Looks pretty good! Thanks 👍🏻
|
@dereuromark please check again if everything seems OK now. |
Fixes #325
BUT there is still a problem which I can't really get my head around.
Its about the new
->fetchTable()method from theLocatorAwareTraitnot returning the "correct" types even though https://github.com/CakeDC/cakephp-phpstan is installed.I was able to easily replace the deprecated
Cake\Filesystem\Folderclass usages with just some plain oldglob()functions. No need for SPL classes.The changes in the
composer.jsonare just my editor re-ordering the packages alphabatically. If this is a problem I can for sure just return that to its original state (and I declared to use phpstan 1.5 and requiring PHP 7.4)