Updating deprecated method calls in tests

tests/TestCase/Controller/Component/AuthComponentTest.php

@@ -1286,7 +1286,7 @@ class AuthComponentTest extends TestCase
         $this->Auth->config('storage', 'Memory');
 
         EventManager::instance()->on('Auth.afterIdentify', function (Event $event) {
-            $user = $event->data(0);
+            $user = $event->getData(0);
             $user['from_callback'] = true;
 
             return $user;

tests/TestCase/Controller/ControllerTest.php

@@ -206,7 +206,7 @@ class TestComponent extends Component
      */
     public function beforeRender(Event $event)
     {
-        $controller = $event->subject();
+        $controller = $event->getSubject();
         if ($this->viewclass) {
             $controller->viewClass = $this->viewclass;
         }
@@ -413,7 +413,7 @@ class ControllerTest extends TestCase
         $Controller = new Controller(new ServerRequest, new Response());
 
         $Controller->getEventManager()->on('Controller.beforeRender', function (Event $event) {
-            $controller = $event->subject();
+            $controller = $event->getSubject();
             $controller->viewClass = 'Json';
         });
 
@@ -1056,7 +1056,7 @@ class ControllerTest extends TestCase
 
         $controller->getEventManager()->on('Controller.beforeRender', function (Event $event) {
             /* @var Controller $controller */
-            $controller = $event->subject();
+            $controller = $event->getSubject();
 
             $controller->set('testVariable', 'test');
         });

tests/TestCase/Database/Type/TimeTypeTest.php

@@ -49,7 +49,7 @@ class TimeTypeTest extends TestCase
         parent::setUp();
         $this->type = new TimeType();
         $this->driver = $this->getMockBuilder('Cake\Database\Driver')->getMock();
-        $this->locale = I18n::locale();
+        $this->locale = I18n::getLocale();
     }
 
     /**
@@ -60,7 +60,7 @@ class TimeTypeTest extends TestCase
     public function tearDown()
     {
         parent::tearDown();
-        I18n::locale($this->locale);
+        I18n::setLocale($this->locale);
     }
 
     /**
@@ -223,7 +223,7 @@ class TimeTypeTest extends TestCase
         $updated = setlocale(LC_COLLATE, 'da_DK.utf8');
         $this->skipIf($updated === false, 'Could not set locale to da_DK.utf8, skipping test.');
 
-        I18n::locale('da_DK');
+        I18n::setLocale('da_DK');
         $this->type->useLocaleParser();
         $expected = new Time('03:20:00');
         $result = $this->type->marshal('03.20');

tests/TestCase/Error/ExceptionRendererTest.php

@@ -809,7 +809,7 @@ class ExceptionRendererTest extends TestCase
             'Controller.beforeRender',
             function (Event $event) {
                 $this->called = true;
-                $event->subject()->viewBuilder()->setLayoutPath('boom');
+                $event->getSubject()->viewBuilder()->setLayoutPath('boom');
             }
         );
         $ExceptionRenderer->controller->request = new ServerRequest;
@@ -928,7 +928,7 @@ class ExceptionRendererTest extends TestCase
     {
         $fired = [];
         $listener = function (Event $event) use (&$fired) {
-            $fired[] = $event->name();
+            $fired[] = $event->getName();
         };
         $events = EventManager::instance();
         $events->attach($listener, 'Controller.shutdown');
@@ -973,7 +973,7 @@ class ExceptionRendererTest extends TestCase
     {
         $fired = [];
         $listener = function (Event $event) use (&$fired) {
-            $fired[] = $event->name();
+            $fired[] = $event->getName();
         };
         $events = EventManager::instance();
         $events->attach($listener, 'Controller.shutdown');

tests/TestCase/Event/Decorator/ConditionDecoratorTest.php

@@ -38,7 +38,7 @@ class ConditionDecoratorTest extends TestCase
 
         $decorator = new ConditionDecorator($callable, [
             'if' => function (Event $event) {
-                return $event->data('canTrigger');
+                return $event->getData('canTrigger');
             }
         ]);
 
@@ -63,7 +63,7 @@ class ConditionDecoratorTest extends TestCase
     public function testCascadingEvents()
     {
         $callable = function (Event $event) {
-            $event->setData('counter', $event->data('counter') + 1);
+            $event->setData('counter', $event->getData('counter') + 1);
 
             return $event;
         };
@@ -75,7 +75,7 @@ class ConditionDecoratorTest extends TestCase
         ]);
 
         $listener2 = function (Event $event) {
-            $event->setData('counter', $event->data('counter') + 1);
+            $event->setData('counter', $event->getData('counter') + 1);
 
             return $event;
         };

tests/TestCase/Event/EventDispatcherTraitTest.php

@@ -98,8 +98,8 @@ class EventDispatcherTraitTest extends TestCase
         $event = $this->subject->dispatchEvent('some.event', ['foo' => 'bar']);
 
         $this->assertInstanceOf('Cake\Event\Event', $event);
-        $this->assertSame($this->subject, $event->subject());
-        $this->assertEquals('some.event', $event->name());
-        $this->assertEquals(['foo' => 'bar'], $event->data());
+        $this->assertSame($this->subject, $event->getSubject());
+        $this->assertEquals('some.event', $event->getName());
+        $this->assertEquals(['foo' => 'bar'], $event->getData());
     }
 }

tests/TestCase/Event/EventManagerTest.php

@@ -421,7 +421,7 @@ class EventManagerTest extends TestCase
             ->method('listenerFunction')
             ->with($event);
         $manager->dispatch($event);
-        $this->assertEquals('something special', $event->result());
+        $this->assertEquals('something special', $event->getResult());
         $this->assertEquals('something special', $event->result);
     }
 
@@ -696,7 +696,7 @@ class EventManagerTest extends TestCase
         $manager = new EventManager();
         $event = new Event('my_event', $manager);
         $manager->dispatch($event);
-        $this->assertEquals('ok', $event->data('callback'));
+        $this->assertEquals('ok', $event->getData('callback'));
     }
 
     /**

tests/TestCase/Event/EventTest.php

@@ -37,7 +37,7 @@ class EventTest extends TestCase
     public function testName()
     {
         $event = new Event('fake.event');
-        $this->assertEquals('fake.event', $event->name());
+        $this->assertEquals('fake.event', $event->getName());
         $this->assertEquals('fake.event', $event->getName());
     }
 
@@ -51,11 +51,11 @@ class EventTest extends TestCase
     public function testSubject()
     {
         $event = new Event('fake.event', $this);
-        $this->assertSame($this, $event->subject());
+        $this->assertSame($this, $event->getSubject());
         $this->assertSame($this, $event->getSubject());
 
         $event = new Event('fake.event');
-        $this->assertNull($event->subject());
+        $this->assertNull($event->getSubject());
     }
 
     /**
@@ -81,7 +81,7 @@ class EventTest extends TestCase
     public function testEventData()
     {
         $event = new Event('fake.event', $this, ['some' => 'data']);
-        $this->assertEquals(['some' => 'data'], $event->data());
+        $this->assertEquals(['some' => 'data'], $event->getData());
         $this->assertEquals(['some' => 'data'], $event->getData());
 
         $this->assertEquals('data', $event->getData('some'));
@@ -98,7 +98,7 @@ class EventTest extends TestCase
     {
         $data = new ArrayObject(['some' => 'data']);
         $event = new Event('fake.event', $this, $data);
-        $this->assertEquals(['some' => 'data'], $event->data());
+        $this->assertEquals(['some' => 'data'], $event->getData());
         $this->assertEquals(['some' => 'data'], $event->getData());
 
         $this->assertEquals('data', $event->getData('some'));
@@ -114,7 +114,7 @@ class EventTest extends TestCase
     public function testEventDirectPropertyAccess()
     {
         $event = new Event('fake.event', $this);
-        $this->assertEquals($this, $event->subject());
-        $this->assertEquals('fake.event', $event->name());
+        $this->assertEquals($this, $event->getSubject());
+        $this->assertEquals('fake.event', $event->getName());
     }
 }

tests/TestCase/Http/ActionDispatcherTest.php

@@ -142,7 +142,7 @@ class ActionDispatcherTest extends TestCase
         $filter->expects($this->once())
             ->method('afterDispatch')
             ->will($this->returnCallback(function (Event $event) {
-                $event->data('response')->body('Filter body');
+                $event->getData('response')->body('Filter body');
             }));
 
         $req = new ServerRequest([

tests/TestCase/I18n/I18nTest.php

@@ -70,7 +70,7 @@ class I18nTest extends TestCase
         $translator = I18n::getTranslator();
         $this->assertInstanceOf('Aura\Intl\TranslatorInterface', $translator);
         $this->assertEquals('%d is 1 (po translated)', $translator->translate('%d = 1'));
-        $this->assertSame($translator, I18n::translator(), 'backwards compat works');
+        $this->assertSame($translator, I18n::getTranslator(), 'backwards compat works');
     }
 
     /**

tests/TestCase/I18n/Parser/PoFileParserTest.php

@@ -35,7 +35,7 @@ class PoFileParserTest extends TestCase
     public function setUp()
     {
         parent::setUp();
-        $this->locale = I18n::locale();
+        $this->locale = I18n::getLocale();
     }
 
     /**
@@ -47,7 +47,7 @@ class PoFileParserTest extends TestCase
     {
         parent::tearDown();
         I18n::clear();
-        I18n::locale($this->locale);
+        I18n::setLocale($this->locale);
         Cache::clear(false, '_cake_core_');
     }
 
@@ -145,19 +145,19 @@ class PoFileParserTest extends TestCase
         $file = APP . 'Locale' . DS . 'en' . DS . 'context.po';
         $messages = $parser->parse($file);
 
-        I18n::translator('default', 'en_CA', function () use ($messages) {
+        I18n::setTranslator('default', function () use ($messages) {
             $package = new Package('default');
             $package->setMessages($messages);
 
             return $package;
-        });
+        },'en_CA');
         $this->assertSame('En cours', $messages['Pending']['_context']['']);
         $this->assertSame('En cours - context', $messages['Pending']['_context']['Pay status']);
         $this->assertSame('En resolved', $messages['Resolved']['_context']['']);
         $this->assertSame('En resolved - context', $messages['Resolved']['_context']['Pay status']);
 
         // Confirm actual behavior
-        I18n::locale('en_CA');
+        I18n::setLocale('en_CA');
         $this->assertSame('En cours', __('Pending'));
         $this->assertSame('En cours - context', __x('Pay status', 'Pending'));
         $this->assertSame('En resolved', __('Resolved'));
@@ -175,15 +175,15 @@ class PoFileParserTest extends TestCase
         $file = APP . 'Locale' . DS . 'en' . DS . 'context.po';
         $messages = $parser->parse($file);
 
-        I18n::translator('default', 'en_US', function () use ($messages) {
+        I18n::setTranslator('default', function () use ($messages) {
             $package = new Package('default');
             $package->setMessages($messages);
 
             return $package;
-        });
+        }, 'en_US');
 
         // Check translated messages
-        I18n::locale('en_US');
+        I18n::setLocale('en_US');
         $this->assertSame('Titel mit Kontext', __x('context', 'title'));
         $this->assertSame('Titel mit anderem Kontext', __x('another_context', 'title'));
         $this->assertSame('Titel ohne Kontext', __('title'));

tests/TestCase/Routing/Filter/ControllerFactoryFilterTest.php

@@ -45,7 +45,7 @@ class ControllerFactoryFilterTest extends TestCase
 
         $this->assertEquals(
             'TestApp\Controller\Admin\PostsController',
-            get_class($event->data('controller'))
+            get_class($event->getData('controller'))
         );
 
         $request->addParams(['prefix' => 'admin/sub', 'controller' => 'Posts', 'action' => 'index']);
@@ -54,7 +54,7 @@ class ControllerFactoryFilterTest extends TestCase
 
         $this->assertEquals(
             'TestApp\Controller\Admin\Sub\PostsController',
-            get_class($event->data('controller'))
+            get_class($event->getData('controller'))
         );
     }
 }

tests/TestCase/View/ViewTest.php

@@ -251,7 +251,7 @@ class TestViewEventListenerInterface implements EventListenerInterface
      */
     public function beforeRender(Event $event)
     {
-        $this->beforeRenderViewType = $event->subject()->getCurrentType();
+        $this->beforeRenderViewType = $event->getSubject()->getCurrentType();
     }
 
     /**
@@ -262,7 +262,7 @@ class TestViewEventListenerInterface implements EventListenerInterface
      */
     public function afterRender(Event $event)
     {
-        $this->afterRenderViewType = $event->subject()->getCurrentType();
+        $this->afterRenderViewType = $event->getSubject()->getCurrentType();
     }
 }