merged branch canni/fix_cs (PR symfony#3146)

Commits ------- 3cfaade [CS] Fix usage of assertCount Discussion ---------- [CS] Fix usage of assertCount Bug fix: no Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - Todo: - [![Build Status](https://secure.travis-ci.org/canni/symfony.png)](http://travis-ci.org/canni/symfony)

Author: fabpot

src/Symfony/Bundle/FrameworkBundle/Tests/ContainerAwareEventDispatcherTest.php

@@ -189,7 +189,7 @@ public function testGetListenersOnLazyLoad()
 
  $this->assertTrue(isset($listeners['onEvent']));
 
- $this->assertEquals(1, count($dispatcher->getListeners('onEvent')));
+ $this->assertCount(1, $dispatcher->getListeners('onEvent'));
  }
 }
 

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php

@@ -70,7 +70,7 @@ public function testValidCollector()
 
  // grab the method calls off of the "profiler" definition
  $methodCalls = $definition->getMethodCalls();
- $this->assertEquals(1, count($methodCalls));
+ $this->assertCount(1, $methodCalls);
  $this->assertEquals('add', $methodCalls[0][0]); // grab the method part of the first call
  }
 }

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -226,11 +226,11 @@ public function testValidationPaths()
  ));
 
  $yamlArgs = $container->getParameter('validator.mapping.loader.yaml_files_loader.mapping_files');
- $this->assertEquals(1, count($yamlArgs));
+ $this->assertCount(1, $yamlArgs);
  $this->assertStringEndsWith('TestBundle'.DIRECTORY_SEPARATOR.'Resources'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'validation.yml', $yamlArgs[0]);
 
  $xmlArgs = $container->getParameter('validator.mapping.loader.xml_files_loader.mapping_files');
- $this->assertEquals(2, count($xmlArgs));
+ $this->assertCount(2, $xmlArgs);
  $this->assertStringEndsWith('Component/Form/Resources/config/validation.xml', $xmlArgs[0]);
  $this->assertStringEndsWith('TestBundle'.DIRECTORY_SEPARATOR.'Resources'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'validation.xml', $xmlArgs[1]);
  }

src/Symfony/Bundle/FrameworkBundle/Tests/Translation/PhpExtractorTest.php

@@ -28,7 +28,7 @@ public function testExtraction()
  $extractor->extract(__DIR__.'/../Fixtures/Resources/views/', $catalogue);
 
  // Assert
- $this->assertEquals(1, count($catalogue->all('messages')), '->extract() should find 1 translation');
+ $this->assertCount(1, $catalogue->all('messages'), '->extract() should find 1 translation');
  $this->assertTrue($catalogue->has('new key'), '->extract() should find at leat "new key" message');
  $this->assertEquals('prefixnew key', $catalogue->get('new key'), '->extract() should apply "prefix" as prefix');
  }

src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php

@@ -64,7 +64,7 @@ public function testAccessRestrictedResourceWithForward($locale)
  $client->insulate();
 
  $crawler = $client->request('GET', '/'.$locale.'/secure/');
- $this->assertEquals(1, count($crawler->selectButton('login')), (string) $client->getResponse());
+ $this->assertCount(1, $crawler->selectButton('login'), (string) $client->getResponse());
  }
 
  public function getLocales()

tests/Symfony/Tests/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPassTest.php

@@ -47,7 +47,7 @@ public function testProcess()
 
  $graph = $this->process($container);
 
- $this->assertEquals(3, count($edges = $graph->getNode('b')->getInEdges()));
+ $this->assertCount(3, $edges = $graph->getNode('b')->getInEdges());
  $this->assertSame($ref1, $edges[0]->getValue());
  $this->assertSame($ref4, $edges[1]->getValue());
  $this->assertSame($ref5, $edges[2]->getValue());
@@ -68,7 +68,7 @@ public function testProcessDetectsReferencesFromInlinedDefinitions()
 
  $graph = $this->process($container);
 
- $this->assertEquals(1, count($refs = $graph->getNode('a')->getInEdges()));
+ $this->assertCount(1, $refs = $graph->getNode('a')->getInEdges());
  $this->assertSame($ref, $refs[0]->getValue());
  }
 
@@ -87,7 +87,7 @@ public function testProcessDoesNotSaveDuplicateReferences()
 
  $graph = $this->process($container);
 
- $this->assertEquals(2, count($graph->getNode('a')->getInEdges()));
+ $this->assertCount(2, $graph->getNode('a')->getInEdges());
  }
 
  protected function process(ContainerBuilder $container)

tests/Symfony/Tests/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPassTest.php

@@ -31,7 +31,7 @@ public function testProcess()
 
  $arguments = $def->getArguments();
  $this->assertNull($arguments[0]);
- $this->assertEquals(0, count($def->getMethodCalls()));
+ $this->assertCount(0, $def->getMethodCalls());
  }
 
  public function testProcessIgnoreNonExistentServices()

tests/Symfony/Tests/Component/DependencyInjection/ContainerBuilderTest.php

@@ -174,7 +174,7 @@ public function testGetAliases()
 
  $builder->set('foobar', 'stdClass');
  $builder->set('moo', 'stdClass');
- $this->assertEquals(0, count($builder->getAliases()), '->getAliases() does not return aliased services that have been overridden');
+ $this->assertCount(0, $builder->getAliases(), '->getAliases() does not return aliased services that have been overridden');
  }
 
  /**

tests/Symfony/Tests/Component/DomCrawler/CrawlerTest.php

@@ -90,7 +90,7 @@ public function testAddHtmlContentWithErrors()
  , 'UTF-8');
 
  $errors = libxml_get_errors();
- $this->assertEquals(1, count($errors));
+ $this->assertCount(1, $errors);
  $this->assertEquals("Tag nav invalid\n", $errors[0]->message);
 
  libxml_clear_errors();
@@ -226,7 +226,7 @@ public function testEq()
  $this->assertInstanceOf('Symfony\\Component\\DomCrawler\\Crawler', $crawler, '->eq() returns a new instance of a crawler');
 
  $this->assertEquals('Two', $crawler->eq(1)->text(), '->eq() returns the nth node of the list');
- $this->assertEquals(0, count($crawler->eq(100)), '->eq() returns an empty crawler if the nth node does not exist');
+ $this->assertCount(0, $crawler->eq(100), '->eq() returns an empty crawler if the nth node does not exist');
  }
 
  public function testEach()
@@ -297,7 +297,7 @@ public function testFilterXPath()
 
  $crawler = $this->createTestCrawler()->filter('ul');
 
- $this->assertEquals(6, count($crawler->filterXPath('//li')), '->filterXPath() filters the node list with the XPath expression');
+ $this->assertCount(6, $crawler->filterXPath('//li'), '->filterXPath() filters the node list with the XPath expression');
  }
 
  /**
@@ -311,7 +311,7 @@ public function testFilter()
 
  $crawler = $this->createTestCrawler()->filter('ul');
 
- $this->assertEquals(6, count($crawler->filter('li')), '->filter() filters the node list with the CSS selector');
+ $this->assertCount(6, $crawler->filter('li'), '->filter() filters the node list with the CSS selector');
  }
 
  public function testSelectLink()
@@ -320,17 +320,17 @@ public function testSelectLink()
  $this->assertNotSame($crawler, $crawler->selectLink('Foo'), '->selectLink() returns a new instance of a crawler');
  $this->assertInstanceOf('Symfony\\Component\\DomCrawler\\Crawler', $crawler, '->selectLink() returns a new instance of a crawler');
 
- $this->assertEquals(1, count($crawler->selectLink('Fabien\'s Foo')), '->selectLink() selects links by the node values');
- $this->assertEquals(1, count($crawler->selectLink('Fabien\'s Bar')), '->selectLink() selects links by the alt attribute of a clickable image');
+ $this->assertCount(1, $crawler->selectLink('Fabien\'s Foo'), '->selectLink() selects links by the node values');
+ $this->assertCount(1, $crawler->selectLink('Fabien\'s Bar'), '->selectLink() selects links by the alt attribute of a clickable image');
 
- $this->assertEquals(2, count($crawler->selectLink('Fabien"s Foo')), '->selectLink() selects links by the node values');
- $this->assertEquals(2, count($crawler->selectLink('Fabien"s Bar')), '->selectLink() selects links by the alt attribute of a clickable image');
+ $this->assertCount(2, $crawler->selectLink('Fabien"s Foo'), '->selectLink() selects links by the node values');
+ $this->assertCount(2, $crawler->selectLink('Fabien"s Bar'), '->selectLink() selects links by the alt attribute of a clickable image');
 
- $this->assertEquals(1, count($crawler->selectLink('\' Fabien"s Foo')), '->selectLink() selects links by the node values');
- $this->assertEquals(1, count($crawler->selectLink('\' Fabien"s Bar')), '->selectLink() selects links by the alt attribute of a clickable image');
+ $this->assertCount(1, $crawler->selectLink('\' Fabien"s Foo'), '->selectLink() selects links by the node values');
+ $this->assertCount(1, $crawler->selectLink('\' Fabien"s Bar'), '->selectLink() selects links by the alt attribute of a clickable image');
 
- $this->assertEquals(4, count($crawler->selectLink('Foo')), '->selectLink() selects links by the node values');
- $this->assertEquals(4, count($crawler->selectLink('Bar')), '->selectLink() selects links by the node values');
+ $this->assertCount(4, $crawler->selectLink('Foo'), '->selectLink() selects links by the node values');
+ $this->assertCount(4, $crawler->selectLink('Bar'), '->selectLink() selects links by the node values');
  }
 
  public function testSelectButton()
@@ -371,7 +371,7 @@ public function testLinks()
  $crawler = $this->createTestCrawler('http://example.com/bar/')->selectLink('Foo');
  $this->assertInternalType('array', $crawler->links(), '->links() returns an array');
 
- $this->assertEquals(4, count($crawler->links()), '->links() returns an array');
+ $this->assertCount(4, $crawler->links(), '->links() returns an array');
  $links = $crawler->links();
  $this->assertInstanceOf('Symfony\\Component\\DomCrawler\\Link', $links[0], '->links() returns an array of Link instances');
 

tests/Symfony/Tests/Component/EventDispatcher/EventDispatcherTest.php

@@ -52,9 +52,9 @@ public function testAddListener()
  $this->dispatcher->addListener('post.foo', array($this->listener, 'postFoo'));
  $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
  $this->assertTrue($this->dispatcher->hasListeners(self::postFoo));
- $this->assertEquals(1, count($this->dispatcher->getListeners(self::preFoo)));
- $this->assertEquals(1, count($this->dispatcher->getListeners(self::postFoo)));
- $this->assertEquals(2, count($this->dispatcher->getListeners()));
+ $this->assertCount(1, $this->dispatcher->getListeners(self::preFoo));
+ $this->assertCount(1, $this->dispatcher->getListeners(self::postFoo));
+ $this->assertCount(2, $this->dispatcher->getListeners());
  }
 
  public function testGetListenersSortsByPriority()
@@ -187,7 +187,7 @@ public function testAddSubscriberWithPriorities()
 
  $listeners = $this->dispatcher->getListeners('pre.foo');
  $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
- $this->assertEquals(2, count($listeners));
+ $this->assertCount(2, $listeners);
  $this->assertInstanceOf('Symfony\Tests\Component\EventDispatcher\TestEventSubscriberWithPriorities', $listeners[0][0]);
  }
 
@@ -198,7 +198,7 @@ public function testAddSubscriberWithMultipleListeners()
 
  $listeners = $this->dispatcher->getListeners('pre.foo');
  $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
- $this->assertEquals(2, count($listeners));
+ $this->assertCount(2, $listeners);
  $this->assertEquals('preFoo2', $listeners[0][1]);
  }
 
@@ -227,7 +227,7 @@ public function testRemoveSubscriberWithMultipleListeners()
  $eventSubscriber = new TestEventSubscriberWithMultipleListeners();
  $this->dispatcher->addSubscriber($eventSubscriber);
  $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
- $this->assertEquals(2, count($this->dispatcher->getListeners(self::preFoo)));
+ $this->assertCount(2, $this->dispatcher->getListeners(self::preFoo));
  $this->dispatcher->removeSubscriber($eventSubscriber);
  $this->assertFalse($this->dispatcher->hasListeners(self::preFoo));
  }