Skip to content

Commit 1876b4f

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.7
* 2.3: Static code analysis Update AnnotationDirectoryLoader.php [FrameworkBundle] Fix template location for PHP templates [FrameworkBundle] Add path verification to the template parsing test cases
2 parents 96eb903 + 89e8619 commit 1876b4f

File tree

32 files changed

+78
-70
lines changed

32 files changed

+78
-70
lines changed

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ protected function setMappingDriverConfig(array $mappingConfig, $mappingName)
153153
*/
154154
protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container)
155155
{
156-
$bundleDir = dirname($bundle->getFilename());
156+
$bundleDir = dirname($bundle->getFileName());
157157

158158
if (!$bundleConfig['type']) {
159159
$bundleConfig['type'] = $this->detectMetadataDriver($bundleDir, $container);

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private function updateValidatorMappingFiles(ContainerBuilder $container, $mappi
6060

6161
foreach ($container->getParameter('kernel.bundles') as $bundle) {
6262
$reflection = new \ReflectionClass($bundle);
63-
if (is_file($file = dirname($reflection->getFilename()).'/'.$validationPath)) {
63+
if (is_file($file = dirname($reflection->getFileName()).'/'.$validationPath)) {
6464
$files[] = realpath($file);
6565
$container->addResource(new FileResource($file));
6666
}

‎src/Symfony/Bundle/FrameworkBundle/Resources/public/css/body.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ build: 56
117117
background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR1JREFUeNpiPHnyZCMDA8MNID5gZmb2nAEJMH7//v3N169fX969e/cYkL8WqGAHXPLv37//QYzfv39/fvPmzbUnT56sAXInmJub/2H5/x8sx8DCwsIrISFhDmQyPX78+CmQXs70798/BmQsKipqBNTgdvz4cWkmkE5kDATMioqKZkCFdiwg1eiAi4tLGqhQF24nMmBmZuYEigth1QkEbEBxTlySYPvJkwSJ00AnjYylgU6gxB8g/oFVEphkvgLF32KNMmCCewYUv4qhEyj47+HDhyeBzIMYOoEp8CxQw56wsLAncJ1//vz5/P79+2svX74EJc2V4BT58+fPd8CE/QKYHMGJOiIiAp6oWW7evDkNSF8DZYfIyEiU7AAQYACJ2vxVdJW4eQAAAABJRU5ErkJggg==) right top no-repeat;
118118
}
119119
.sf-button .btn-bg {
120-
padding: 0px 14px;
120+
padding: 0 14px;
121121
color: #636363;
122122
line-height: 28px;
123123
background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAYAAACgXdXMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAClJREFUeNpiPnny5EKGf//+/Wf6//8/A4QAcrGzKCZwGc9sa2urBBBgAIbDUoYVp9lmAAAAAElFTkSuQmCC) repeat-x top left;

‎src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function parse($name)
5555
throw new \RuntimeException(sprintf('Template name "%s" contains invalid characters.', $name));
5656
}
5757

58-
if (!preg_match('/^([^:]*):([^:]*):(.+)\.([^\.]+)\.([^\.]+)$/', $name, $matches)) {
58+
if (!preg_match('/^(?:([^:]*):)?(?:([^:]*):)?(.+)\.([^\.]+)\.([^\.]+)$/', $name, $matches)) {
5959
return parent::parse($name);
6060
}
6161

‎src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php

+19-16
Original file line numberDiff line numberDiff line change
@@ -43,30 +43,33 @@ protected function tearDown()
4343
}
4444

4545
/**
46-
* @dataProvider getLogicalNameToTemplateProvider
46+
* @dataProvider parseProvider
4747
*/
48-
public function testParse($name, $ref)
48+
public function testParse($name, $logicalName, $path, $ref)
4949
{
5050
$template = $this->parser->parse($name);
5151

52-
$this->assertEquals($template->getLogicalName(), $ref->getLogicalName());
53-
$this->assertEquals($template->getLogicalName(), $name);
52+
$this->assertSame($ref->getLogicalName(), $template->getLogicalName());
53+
$this->assertSame($logicalName, $template->getLogicalName());
54+
$this->assertSame($path, $template->getPath());
5455
}
5556

56-
public function getLogicalNameToTemplateProvider()
57+
public function parseProvider()
5758
{
5859
return array(
59-
array('FooBundle:Post:index.html.php', new TemplateReference('FooBundle', 'Post', 'index', 'html', 'php')),
60-
array('FooBundle:Post:index.html.twig', new TemplateReference('FooBundle', 'Post', 'index', 'html', 'twig')),
61-
array('FooBundle:Post:index.xml.php', new TemplateReference('FooBundle', 'Post', 'index', 'xml', 'php')),
62-
array('SensioFooBundle:Post:index.html.php', new TemplateReference('SensioFooBundle', 'Post', 'index', 'html', 'php')),
63-
array('SensioCmsFooBundle:Post:index.html.php', new TemplateReference('SensioCmsFooBundle', 'Post', 'index', 'html', 'php')),
64-
array(':Post:index.html.php', new TemplateReference('', 'Post', 'index', 'html', 'php')),
65-
array('::index.html.php', new TemplateReference('', '', 'index', 'html', 'php')),
66-
array('FooBundle:Post:foo.bar.index.html.php', new TemplateReference('FooBundle', 'Post', 'foo.bar.index', 'html', 'php')),
67-
array('/path/to/section/name.php', new BaseTemplateReference('/path/to/section/name.php', 'php')),
68-
array('name.twig', new BaseTemplateReference('name.twig', 'twig')),
69-
array('name', new BaseTemplateReference('name')),
60+
array('FooBundle:Post:index.html.php', 'FooBundle:Post:index.html.php', '@FooBundle/Resources/views/Post/index.html.php', new TemplateReference('FooBundle', 'Post', 'index', 'html', 'php')),
61+
array('FooBundle:Post:index.html.twig', 'FooBundle:Post:index.html.twig', '@FooBundle/Resources/views/Post/index.html.twig', new TemplateReference('FooBundle', 'Post', 'index', 'html', 'twig')),
62+
array('FooBundle:Post:index.xml.php', 'FooBundle:Post:index.xml.php', '@FooBundle/Resources/views/Post/index.xml.php', new TemplateReference('FooBundle', 'Post', 'index', 'xml', 'php')),
63+
array('SensioFooBundle:Post:index.html.php', 'SensioFooBundle:Post:index.html.php', '@SensioFooBundle/Resources/views/Post/index.html.php', new TemplateReference('SensioFooBundle', 'Post', 'index', 'html', 'php')),
64+
array('SensioCmsFooBundle:Post:index.html.php', 'SensioCmsFooBundle:Post:index.html.php', '@SensioCmsFooBundle/Resources/views/Post/index.html.php', new TemplateReference('SensioCmsFooBundle', 'Post', 'index', 'html', 'php')),
65+
array(':Post:index.html.php', ':Post:index.html.php', 'views/Post/index.html.php', new TemplateReference('', 'Post', 'index', 'html', 'php')),
66+
array('::index.html.php', '::index.html.php', 'views/index.html.php', new TemplateReference('', '', 'index', 'html', 'php')),
67+
array('index.html.php', '::index.html.php', 'views/index.html.php', new TemplateReference('', '', 'index', 'html', 'php')),
68+
array('FooBundle:Post:foo.bar.index.html.php', 'FooBundle:Post:foo.bar.index.html.php', '@FooBundle/Resources/views/Post/foo.bar.index.html.php', new TemplateReference('FooBundle', 'Post', 'foo.bar.index', 'html', 'php')),
69+
array('/path/to/section/name.php', '/path/to/section/name.php', '/path/to/section/name.php', new BaseTemplateReference('/path/to/section/name.php', 'php')),
70+
array('name.twig', 'name.twig', 'name.twig', new BaseTemplateReference('name.twig', 'twig')),
71+
array('name', 'name', 'name', new BaseTemplateReference('name')),
72+
array('default/index.html.php', '::default/index.html.php', 'views/default/index.html.php', new TemplateReference(null, null, 'default/index', 'html', 'php')),
7073
);
7174
}
7275

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/body.css.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ build: 56
116116
background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR1JREFUeNpiPHnyZCMDA8MNID5gZmb2nAEJMH7//v3N169fX969e/cYkL8WqGAHXPLv37//QYzfv39/fvPmzbUnT56sAXInmJub/2H5/x8sx8DCwsIrISFhDmQyPX78+CmQXs70798/BmQsKipqBNTgdvz4cWkmkE5kDATMioqKZkCFdiwg1eiAi4tLGqhQF24nMmBmZuYEigth1QkEbEBxTlySYPvJkwSJ00AnjYylgU6gxB8g/oFVEphkvgLF32KNMmCCewYUv4qhEyj47+HDhyeBzIMYOoEp8CxQw56wsLAncJ1//vz5/P79+2svX74EJc2V4BT58+fPd8CE/QKYHMGJOiIiAp6oWW7evDkNSF8DZYfIyEiU7AAQYACJ2vxVdJW4eQAAAABJRU5ErkJggg==) right top no-repeat;
117117
}
118118
.sf-button .btn-bg {
119-
padding: 0px 14px;
119+
padding: 0 14px;
120120
color: #636363;
121121
line-height: 28px;
122122
background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAYAAACgXdXMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAClJREFUeNpiPnny5EKGf//+/Wf6//8/A4QAcrGzKCZwGc9sa2urBBBgAIbDUoYVp9lmAAAAAElFTkSuQmCC) repeat-x top left;

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig

+1-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@
6363
<script>//<![CDATA[
6464
6565
function toggleMenuPanels(state, doSave) {
66-
var menu = document.getElementById('navigation'), savedState = Sfjs.getPreference('menu/displayState'),
67-
displayState, elem, className;
66+
var menu = document.getElementById('navigation'), savedState = Sfjs.getPreference('menu/displayState'), displayState;
6867
6968
if (null === savedState) {
7069
savedState = 'block';

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig

+4-6
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ pre, code {
134134
}
135135
#menu-profiler li a span.label {
136136
display: block;
137-
padding: 20px 0px 16px 65px;
137+
padding: 20px 0 16px 65px;
138138
min-height: 16px;
139139
overflow: hidden;
140140
}
@@ -285,7 +285,6 @@ ul.alt li.scream, ul.alt li.scream strong {
285285
color: gray;
286286
}
287287
ul.sf-call-stack li {
288-
text-size: small;
289288
padding: 0 0 0 20px;
290289
}
291290
td.main, td.menu {
@@ -385,13 +384,12 @@ td.main, td.menu {
385384
line-height: 1.5em;
386385
}
387386
.sf-profiler-timeline .legends span {
388-
border-left-width: 10px;
389-
border-left-style: solid;
387+
border-left: 10px solid;
390388
padding: 0 10px 0 5px;
391389
}
392390
.sf-profiler-timeline canvas {
393-
border: 1px solid #999;
394-
border-width: 1px 0;
391+
border: 1px #999;
392+
border-style: solid none;
395393
}
396394
.collapsed-menu-parents #resume,
397395
.collapsed-menu-parents #collector-content {

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig

+4-6
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@
104104
}
105105

106106
.sf-toolbar-block .sf-toolbar-info-piece .sf-toolbar-status {
107-
padding: 0px 5px;
107+
padding: 0 5px;
108108
border-radius: 5px;
109-
margin-bottom: 0px;
109+
margin-bottom: 0;
110110
vertical-align: top;
111111
}
112112

@@ -140,13 +140,11 @@
140140
display: none;
141141
position: absolute;
142142
background-color: #fff;
143-
border: 1px solid #bbb;
144143
padding: 9px 0;
145144
margin-left: -1px;
146145

147146
bottom: 38px;
148-
border-bottom-width: 0;
149-
border-bottom: 1px solid #bbb;
147+
border: 1px solid #bbb;
150148
border-radius: 4px 4px 0 0;
151149
}
152150

@@ -205,7 +203,7 @@
205203
}
206204

207205
.sf-toolbar-block .sf-toolbar-icon > a,
208-
.sf-toolbar-block .sf-toolbar-icon > a:link
206+
.sf-toolbar-block .sf-toolbar-icon > a:link,
209207
.sf-toolbar-block .sf-toolbar-icon > a:hover {
210208
color: black !important;
211209
}

‎src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php

-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ public function testReturns404onTokenNotFound()
6262
if ('found' == $token) {
6363
return new Profile($token);
6464
}
65-
66-
return;
6765
}))
6866
;
6967

‎src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function testHtmlShakespear($css, $count)
7474
$document = simplexml_import_dom($document);
7575
$bodies = $document->xpath('//body');
7676
$elements = $bodies[0]->xpath($translator->cssToXPath($css));
77-
$this->assertEquals($count, count($elements));
77+
$this->assertCount($count, $elements);
7878
}
7979

8080
public function getXpathLiteralTestData()

‎src/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php

+25-1
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,27 @@ public function testAddASubscriberService()
5959
->with($event)
6060
;
6161

62+
$service
63+
->expects($this->once())
64+
->method('onEventWithPriority')
65+
->with($event)
66+
;
67+
68+
$service
69+
->expects($this->once())
70+
->method('onEventNested')
71+
->with($event)
72+
;
73+
6274
$container = new Container();
6375
$container->set('service.subscriber', $service);
6476

6577
$dispatcher = new ContainerAwareEventDispatcher($container);
6678
$dispatcher->addSubscriberService('service.subscriber', 'Symfony\Component\EventDispatcher\Tests\SubscriberService');
6779

6880
$dispatcher->dispatch('onEvent', $event);
81+
$dispatcher->dispatch('onEventWithPriority', $event);
82+
$dispatcher->dispatch('onEventNested', $event);
6983
}
7084

7185
public function testPreventDuplicateListenerService()
@@ -239,11 +253,21 @@ class SubscriberService implements EventSubscriberInterface
239253
public static function getSubscribedEvents()
240254
{
241255
return array(
242-
'onEvent' => array('onEvent'),
256+
'onEvent' => 'onEvent',
257+
'onEventWithPriority' => array('onEventWithPriority', 10),
258+
'onEventNested' => array(array('onEventNested')),
243259
);
244260
}
245261

246262
public function onEvent(Event $e)
247263
{
248264
}
265+
266+
public function onEventWithPriority(Event $e)
267+
{
268+
}
269+
270+
public function onEventNested(Event $e)
271+
{
272+
}
249273
}

‎src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function searchInDirectory($dir)
9494
$command->setErrorHandler(
9595
$this->ignoreUnreadableDirs
9696
// If directory is unreadable and finder is set to ignore it, `stderr` is ignored.
97-
? function ($stderr) { return; }
97+
? function ($stderr) { }
9898
: function ($stderr) { throw new AccessDeniedException($stderr); }
9999
);
100100

‎src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function testValidationGroupsCanBeSetToCallback()
6464
public function testValidationGroupsCanBeSetToClosure()
6565
{
6666
$form = $this->createForm(array(
67-
'validation_groups' => function (FormInterface $form) { return; },
67+
'validation_groups' => function (FormInterface $form) { },
6868
));
6969

7070
$this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));

‎src/Symfony/Component/Form/Tests/Util/OrderedHashMapTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,6 @@ public function testCount()
482482
unset($map[0]);
483483
$map[] = 3;
484484

485-
$this->assertSame(2, count($map));
485+
$this->assertCount(2, $map);
486486
}
487487
}

‎src/Symfony/Component/HttpFoundation/Request.php

-2
Original file line numberDiff line numberDiff line change
@@ -1828,8 +1828,6 @@ protected function preparePathInfo()
18281828
return '/';
18291829
}
18301830

1831-
$pathInfo = '/';
1832-
18331831
// Remove the query string from REQUEST_URI
18341832
if ($pos = strpos($requestUri, '?')) {
18351833
$requestUri = substr($requestUri, 0, $pos);

‎src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ protected function invalidate(Request $request, $catch = false)
277277
// invalidate only when the response is successful
278278
if ($response->isSuccessful() || $response->isRedirect()) {
279279
try {
280-
$this->store->invalidate($request, $catch);
280+
$this->store->invalidate($request);
281281

282282
// As per the RFC, invalidate Location and Content-Location URLs if present
283283
foreach (array('Location', 'Content-Location') as $header) {
@@ -503,7 +503,7 @@ protected function forward(Request $request, $catch = false, Response $entry = n
503503
$this->processResponseBody($request, $response);
504504

505505
if ($this->isPrivateRequest($request) && !$response->headers->hasCacheControlDirective('public')) {
506-
$response->setPrivate(true);
506+
$response->setPrivate();
507507
} elseif ($this->options['default_ttl'] > 0 && null === $response->getTtl() && !$response->headers->getCacheControlDirective('must-revalidate')) {
508508
$response->setTtl($this->options['default_ttl']);
509509
}

‎src/Symfony/Component/HttpKernel/Profiler/SqliteProfilerStorage.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected function fetch($db, $query, array $args = array())
7777
$return = array();
7878

7979
if ($db instanceof \SQLite3) {
80-
$stmt = $this->prepareStatement($db, $query, true);
80+
$stmt = $this->prepareStatement($db, $query);
8181
foreach ($args as $arg => $val) {
8282
$stmt->bindValue($arg, $val, is_int($val) ? \SQLITE3_INTEGER : \SQLITE3_TEXT);
8383
}

‎src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php

-2
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ protected function generateDataForLocale(BundleReaderInterface $reader, $tempDir
121121

122122
return $data;
123123
}
124-
125-
return;
126124
}
127125

128126
/**

‎src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php

-3
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,13 @@ protected function generateDataForLocale(BundleReaderInterface $reader, $tempDir
133133

134134
return $data;
135135
}
136-
137-
return;
138136
}
139137

140138
/**
141139
* {@inheritdoc}
142140
*/
143141
protected function generateDataForRoot(BundleReaderInterface $reader, $tempDir)
144142
{
145-
return;
146143
}
147144

148145
/**

‎src/Symfony/Component/Intl/Data/Util/LocaleScanner.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function scanLocales($sourceDir)
6767
*/
6868
public function scanAliases($sourceDir)
6969
{
70-
$locales = $this->scanLocales($sourceDir, '.txt');
70+
$locales = $this->scanLocales($sourceDir);
7171
$aliases = array();
7272

7373
// Delete locales that are no aliases

‎src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -638,8 +638,7 @@ protected function getDefaultPattern()
638638
if (self::NONE !== $this->timetype) {
639639
$patternParts[] = $this->defaultTimeFormats[$this->timetype];
640640
}
641-
$pattern = implode(', ', $patternParts);
642641

643-
return $pattern;
642+
return implode(', ', $patternParts);
644643
}
645644
}

‎src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/IntlBundleReaderTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Intl\Tests\Data\Bundle\Reader;
1313

1414
use Symfony\Component\Intl\Data\Bundle\Reader\IntlBundleReader;
15-
use Symfony\Component\Intl\Intl;
1615

1716
/**
1817
* @author Bernhard Schussek <bschussek@gmail.com>

‎src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/JsonBundleWriterTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
use Symfony\Component\Filesystem\Filesystem;
1515
use Symfony\Component\Intl\Data\Bundle\Writer\JsonBundleWriter;
16-
use Symfony\Component\Intl\Intl;
1716

1817
/**
1918
* @author Bernhard Schussek <bschussek@gmail.com>

‎src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
use Symfony\Component\Filesystem\Filesystem;
1515
use Symfony\Component\Intl\Data\Bundle\Writer\PhpBundleWriter;
16-
use Symfony\Component\Intl\Intl;
1716

1817
/**
1918
* @author Bernhard Schussek <bschussek@gmail.com>

‎src/Symfony/Component/Intl/Tests/Data/Util/LocaleScannerTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ public function testScanLocales()
6464
{
6565
$sortedLocales = array('de', 'de_alias', 'en', 'en_alias', 'fr', 'fr_alias');
6666

67-
$this->assertSame($sortedLocales, $this->scanner->scanLocales($this->directory, '.txt'));
67+
$this->assertSame($sortedLocales, $this->scanner->scanLocales($this->directory));
6868
}
6969

7070
public function testScanAliases()
7171
{
7272
$sortedAliases = array('de_alias' => 'de', 'en_alias' => 'en', 'fr_alias' => 'fr');
7373

74-
$this->assertSame($sortedAliases, $this->scanner->scanAliases($this->directory, '.txt'));
74+
$this->assertSame($sortedAliases, $this->scanner->scanAliases($this->directory));
7575
}
7676
}

0 commit comments

Comments
 (0)