Skip to content

Fix short array syntax for php 5.3 #16921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dunglas merged 1 commit into from
Dec 9, 2015
Merged

Fix short array syntax for php 5.3 #16921

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ class AbstractNormalizerTest extends \PHPUnit_Framework_TestCase

protected function setUp()
{
$loader = $this->getMock('Symfony\Component\Serializer\Mapping\Loader\LoaderChain', [], [[]]);
$this->classMetadata = $this->getMock('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory', [], [$loader]);
$loader = $this->getMock('Symfony\Component\Serializer\Mapping\Loader\LoaderChain', array(), array(array()));
$this->classMetadata = $this->getMock('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory', array(), array($loader));
$this->normalizer = new AbstractNormalizerDummy($this->classMetadata);
}

Expand All @@ -53,11 +53,11 @@ public function testGetAllowedAttributesAsString()

$this->classMetadata->method('getMetadataFor')->willReturn($classMetadata);

$result = $this->normalizer->getAllowedAttributes('c', ['groups' => ['test']], true);
$this->assertEquals(['a2', 'a4'], $result);
$result = $this->normalizer->getAllowedAttributes('c', array('groups' => array('test')), true);
$this->assertEquals(array('a2', 'a4'), $result);

$result = $this->normalizer->getAllowedAttributes('c', ['groups' => ['other']], true);
$this->assertEquals(['a3', 'a4'], $result);
$result = $this->normalizer->getAllowedAttributes('c', array('groups' => array('other')), true);
$this->assertEquals(array('a3', 'a4'), $result);
}

public function testGetAllowedAttributesAsObjects()
Expand All @@ -82,10 +82,10 @@ public function testGetAllowedAttributesAsObjects()

$this->classMetadata->method('getMetadataFor')->willReturn($classMetadata);

$result = $this->normalizer->getAllowedAttributes('c', ['groups' => ['test']], false);
$this->assertEquals([$a2, $a4], $result);
$result = $this->normalizer->getAllowedAttributes('c', array('groups' => array('test')), false);
$this->assertEquals(array($a2, $a4), $result);

$result = $this->normalizer->getAllowedAttributes('c', ['groups' => ['other']], false);
$this->assertEquals([$a3, $a4], $result);
$result = $this->normalizer->getAllowedAttributes('c', array('groups' => array('other')), false);
$this->assertEquals(array($a3, $a4), $result);
}
}