Merge pull request #11605 from cakephp/deprecated-calls

Remove deprecated function calls

src/Console/CommandRunner.php

@@ -22,16 +22,17 @@ use Cake\Console\ConsoleIo;
 use Cake\Console\Exception\StopException;
 use Cake\Console\Shell;
 use Cake\Core\ConsoleApplicationInterface;
-use Cake\Event\EventManagerTrait;
+use Cake\Event\EventDispatcherInterface;
+use Cake\Event\EventDispatcherTrait;
 use Cake\Utility\Inflector;
 use RuntimeException;
 
 /**
  * Run CLI commands for the provided application.
  */
-class CommandRunner
+class CommandRunner implements EventDispatcherInterface
 {
-    use EventManagerTrait;
+    use EventDispatcherTrait;
 
     /**
      * The application console commands are being run for.

src/ORM/Association/BelongsToMany.php

@@ -784,7 +784,7 @@ class BelongsToMany extends Association
             // Saving the new linked entity failed, copy errors back into the
             // original entity if applicable and abort.
             if (!empty($options['atomic'])) {
-                $original[$k]->errors($entity->errors());
+                $original[$k]->setErrors($entity->getErrors());
             }
             if (!$saved) {
                 return false;