diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.7' into 2.8

Browse Source 
* 2.7:
  Fix indent of methods
This commit is contained in:
Fabien Potencier 2017-07-05 09:50:35 +03:00
commit 442058dc61
2 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php
View File

@ -78,27 +78,27 @@ class SecurityRoutingIntegrationTest extends WebTestCase
$this->assertRestricted($barredClient, '/secured-by-two-ips'); $this->assertRestricted($barredClient, '/secured-by-two-ips');
} }
/** /**
* @dataProvider getConfigs * @dataProvider getConfigs
*/ */
public function testSecurityConfigurationForExpression($config) public function testSecurityConfigurationForExpression($config)
{ {
$allowedClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array('HTTP_USER_AGENT' => 'Firefox 1.0')); $allowedClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array('HTTP_USER_AGENT' => 'Firefox 1.0'));
$this->assertAllowed($allowedClient, '/protected-via-expression'); $this->assertAllowed($allowedClient, '/protected-via-expression');
$barredClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array()); $barredClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array());
$this->assertRestricted($barredClient, '/protected-via-expression'); $this->assertRestricted($barredClient, '/protected-via-expression');
$allowedClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array()); $allowedClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array());
$allowedClient->request('GET', '/protected-via-expression'); $allowedClient->request('GET', '/protected-via-expression');
$form = $allowedClient->followRedirect()->selectButton('login')->form(); $form = $allowedClient->followRedirect()->selectButton('login')->form();
$form['_username'] = 'johannes'; $form['_username'] = 'johannes';
$form['_password'] = 'test'; $form['_password'] = 'test';
$allowedClient->submit($form); $allowedClient->submit($form);
$this->assertRedirect($allowedClient->getResponse(), '/protected-via-expression'); $this->assertRedirect($allowedClient->getResponse(), '/protected-via-expression');
$this->assertAllowed($allowedClient, '/protected-via-expression'); $this->assertAllowed($allowedClient, '/protected-via-expression');
} }
private function assertAllowed($client, $path) private function assertAllowed($client, $path)
{ {

88
src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
View File

@ -43,17 +43,17 @@ class LegacyApcUniversalClassLoaderTest extends TestCase
$this->assertEquals($loader->findFile('\LegacyApc\Namespaced\FooBar'), apcu_fetch('test.prefix.\LegacyApc\Namespaced\FooBar'), '__construct() takes a prefix as its first argument'); $this->assertEquals($loader->findFile('\LegacyApc\Namespaced\FooBar'), apcu_fetch('test.prefix.\LegacyApc\Namespaced\FooBar'), '__construct() takes a prefix as its first argument');
} }
/** /**
* @dataProvider getLoadClassTests * @dataProvider getLoadClassTests
*/ */
public function testLoadClass($className, $testClassName, $message) public function testLoadClass($className, $testClassName, $message)
{ {
$loader = new ApcUniversalClassLoader('test.prefix.'); $loader = new ApcUniversalClassLoader('test.prefix.');
$loader->registerNamespace('LegacyApc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures'); $loader->registerNamespace('LegacyApc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
$loader->registerPrefix('LegacyApc_Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures'); $loader->registerPrefix('LegacyApc_Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
$loader->loadClass($testClassName); $loader->loadClass($testClassName);
$this->assertTrue(class_exists($className), $message); $this->assertTrue(class_exists($className), $message);
} }
public function getLoadClassTests() public function getLoadClassTests()
{ {
@ -63,19 +63,19 @@ class LegacyApcUniversalClassLoaderTest extends TestCase
); );
} }
/** /**
* @dataProvider getLoadClassFromFallbackTests * @dataProvider getLoadClassFromFallbackTests
*/ */
public function testLoadClassFromFallback($className, $testClassName, $message) public function testLoadClassFromFallback($className, $testClassName, $message)
{ {
$loader = new ApcUniversalClassLoader('test.prefix.fallback'); $loader = new ApcUniversalClassLoader('test.prefix.fallback');
$loader->registerNamespace('LegacyApc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures'); $loader->registerNamespace('LegacyApc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
$loader->registerPrefix('LegacyApc_Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures'); $loader->registerPrefix('LegacyApc_Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
$loader->registerNamespaceFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/LegacyApc/fallback')); $loader->registerNamespaceFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/LegacyApc/fallback'));
$loader->registerPrefixFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/LegacyApc/fallback')); $loader->registerPrefixFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/LegacyApc/fallback'));
$loader->loadClass($testClassName); $loader->loadClass($testClassName);
$this->assertTrue(class_exists($className), $message); $this->assertTrue(class_exists($className), $message);
} }
public function getLoadClassFromFallbackTests() public function getLoadClassFromFallbackTests()
{ {
@ -87,18 +87,18 @@ class LegacyApcUniversalClassLoaderTest extends TestCase
); );
} }
/** /**
* @dataProvider getLoadClassNamespaceCollisionTests * @dataProvider getLoadClassNamespaceCollisionTests
*/ */
public function testLoadClassNamespaceCollision($namespaces, $className, $message) public function testLoadClassNamespaceCollision($namespaces, $className, $message)
{ {
$loader = new ApcUniversalClassLoader('test.prefix.collision.'); $loader = new ApcUniversalClassLoader('test.prefix.collision.');
$loader->registerNamespaces($namespaces); $loader->registerNamespaces($namespaces);
$loader->loadClass($className); $loader->loadClass($className);
$this->assertTrue(class_exists($className), $message); $this->assertTrue(class_exists($className), $message);
} }
public function getLoadClassNamespaceCollisionTests() public function getLoadClassNamespaceCollisionTests()
{ {
@ -138,17 +138,17 @@ class LegacyApcUniversalClassLoaderTest extends TestCase
); );
} }
/** /**
* @dataProvider getLoadClassPrefixCollisionTests * @dataProvider getLoadClassPrefixCollisionTests
*/ */
public function testLoadClassPrefixCollision($prefixes, $className, $message) public function testLoadClassPrefixCollision($prefixes, $className, $message)
{ {
$loader = new ApcUniversalClassLoader('test.prefix.collision.'); $loader = new ApcUniversalClassLoader('test.prefix.collision.');
$loader->registerPrefixes($prefixes); $loader->registerPrefixes($prefixes);
$loader->loadClass($className); $loader->loadClass($className);
$this->assertTrue(class_exists($className), $message); $this->assertTrue(class_exists($className), $message);
} }
public function getLoadClassPrefixCollisionTests() public function getLoadClassPrefixCollisionTests()
{ {