Skip to content

Commit

Permalink
Updating deprecated method calls in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@burzum
burzum committed Aug 24, 2017
1 parent 4ad814e commit 965ba0d
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion tests/TestCase/Controller/Component/AuthComponentTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,7 @@ public function testAfterIdentifyForStatelessAuthentication()
$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;
Expand Down
6 changes: 3 additions & 3 deletions tests/TestCase/Controller/ControllerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ public function shutdown(Event $event)
*/
public function beforeRender(Event $event)
{
$controller = $event->subject();
$controller = $event->getSubject();
if ($this->viewclass) {
$controller->viewClass = $this->viewclass;
}
Expand Down Expand Up @@ -413,7 +413,7 @@ public function testBeforeRenderCallbackChangingViewClass()
$Controller = new Controller(new ServerRequest, new Response());

$Controller->getEventManager()->on('Controller.beforeRender', function (Event $event) {
$controller = $event->subject();
$controller = $event->getSubject();
$controller->viewClass = 'Json';
});

Expand Down Expand Up @@ -1056,7 +1056,7 @@ public function testBeforeRenderViewVariables()

$controller->getEventManager()->on('Controller.beforeRender', function (Event $event) {
/* @var Controller $controller */
$controller = $event->subject();
$controller = $event->getSubject();

$controller->set('testVariable', 'test');
});
Expand Down
6 changes: 3 additions & 3 deletions tests/TestCase/Database/Type/TimeTypeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function setUp()
parent::setUp();
$this->type = new TimeType();
$this->driver = $this->getMockBuilder('Cake\Database\Driver')->getMock();
$this->locale = I18n::locale();
$this->locale = I18n::getLocale();
}

/**
Expand All @@ -60,7 +60,7 @@ public function setUp()
public function tearDown()
{
parent::tearDown();
I18n::locale($this->locale);
I18n::setLocale($this->locale);
}

/**
Expand Down Expand Up @@ -223,7 +223,7 @@ public function testMarshalWithLocaleParsingDanishLocale()
$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');
Expand Down
6 changes: 3 additions & 3 deletions tests/TestCase/Error/ExceptionRendererTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ public function testMissingLayoutPathRenderSafe()
'Controller.beforeRender',
function (Event $event) {
$this->called = true;
$event->subject()->viewBuilder()->setLayoutPath('boom');
$event->getSubject()->viewBuilder()->setLayoutPath('boom');
}
);
$ExceptionRenderer->controller->request = new ServerRequest;
Expand Down Expand Up @@ -928,7 +928,7 @@ public function testRenderShutdownEvents()
{
$fired = [];
$listener = function (Event $event) use (&$fired) {
$fired[] = $event->name();
$fired[] = $event->getName();
};
$events = EventManager::instance();
$events->attach($listener, 'Controller.shutdown');
Expand Down Expand Up @@ -973,7 +973,7 @@ public function testSubclassTriggerShutdownEvents()
{
$fired = [];
$listener = function (Event $event) use (&$fired) {
$fired[] = $event->name();
$fired[] = $event->getName();
};
$events = EventManager::instance();
$events->attach($listener, 'Controller.shutdown');
Expand Down
6 changes: 3 additions & 3 deletions tests/TestCase/Event/Decorator/ConditionDecoratorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function testCanTriggerIf()

$decorator = new ConditionDecorator($callable, [
'if' => function (Event $event) {
return $event->data('canTrigger');
return $event->getData('canTrigger');
}
]);

Expand All @@ -63,7 +63,7 @@ public function testCanTriggerIf()
public function testCascadingEvents()
{
$callable = function (Event $event) {
$event->setData('counter', $event->data('counter') + 1);
$event->setData('counter', $event->getData('counter') + 1);

return $event;
};
Expand All @@ -75,7 +75,7 @@ public function testCascadingEvents()
]);

$listener2 = function (Event $event) {
$event->setData('counter', $event->data('counter') + 1);
$event->setData('counter', $event->getData('counter') + 1);

return $event;
};
Expand Down
6 changes: 3 additions & 3 deletions tests/TestCase/Event/EventDispatcherTraitTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ public function testDispatchEvent()
$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());
}
}
4 changes: 2 additions & 2 deletions tests/TestCase/Event/EventManagerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ public function testDispatchReturnValue()
->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);
}

Expand Down Expand Up @@ -696,7 +696,7 @@ public function testDispatchLocalHandledByGlobal()
$manager = new EventManager();
$event = new Event('my_event', $manager);
$manager->dispatch($event);
$this->assertEquals('ok', $event->data('callback'));
$this->assertEquals('ok', $event->getData('callback'));
}

/**
Expand Down
14 changes: 7 additions & 7 deletions tests/TestCase/Event/EventTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand All @@ -51,11 +51,11 @@ public function testName()
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());
}

/**
Expand All @@ -81,7 +81,7 @@ public function testPropagation()
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'));
Expand All @@ -98,7 +98,7 @@ public function testEventDataObject()
{
$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'));
Expand All @@ -114,7 +114,7 @@ public function testEventDataObject()
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());
}
}
2 changes: 1 addition & 1 deletion tests/TestCase/Http/ActionDispatcherTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public function testDispatchAfterDispatchEventModifyResponse()
$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([
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/I18n/I18nTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public function testGetDefaultTranslator()
$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');
}

/**
Expand Down
16 changes: 8 additions & 8 deletions tests/TestCase/I18n/Parser/PoFileParserTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class PoFileParserTest extends TestCase
public function setUp()
{
parent::setUp();
$this->locale = I18n::locale();
$this->locale = I18n::getLocale();
}

/**
Expand All @@ -47,7 +47,7 @@ public function tearDown()
{
parent::tearDown();
I18n::clear();
I18n::locale($this->locale);
I18n::setLocale($this->locale);
Cache::clear(false, '_cake_core_');
}

Expand Down Expand Up @@ -145,19 +145,19 @@ public function testParseContextOnSomeMessages()
$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'));
Expand All @@ -175,15 +175,15 @@ public function testParseContextMessages()
$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'));
Expand Down
4 changes: 2 additions & 2 deletions tests/TestCase/Routing/Filter/ControllerFactoryFilterTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function testBeforeDispatch()

$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']);
Expand All @@ -54,7 +54,7 @@ public function testBeforeDispatch()

$this->assertEquals(
'TestApp\Controller\Admin\Sub\PostsController',
get_class($event->data('controller'))
get_class($event->getData('controller'))
);
}
}
4 changes: 2 additions & 2 deletions tests/TestCase/View/ViewTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ public function implementedEvents()
*/
public function beforeRender(Event $event)
{
$this->beforeRenderViewType = $event->subject()->getCurrentType();
$this->beforeRenderViewType = $event->getSubject()->getCurrentType();
}

/**
Expand All @@ -262,7 +262,7 @@ public function beforeRender(Event $event)
*/
public function afterRender(Event $event)
{
$this->afterRenderViewType = $event->subject()->getCurrentType();
$this->afterRenderViewType = $event->getSubject()->getCurrentType();
}
}

Expand Down

0 comments on commit 965ba0d

Please sign in to comment.