CS fixes
This commit is contained in:
parent
9aff1ec93c
commit
ed4fb54901
@ -93,8 +93,9 @@ class AssetsExtension extends \Twig_Extension
|
||||
*
|
||||
* @param string $url The URL that has to be absolute
|
||||
*
|
||||
* @return string The absolute URL
|
||||
* @throws \RuntimeException
|
||||
*
|
||||
* @return string The absolute URL
|
||||
*/
|
||||
private function ensureUrlIsAbsolute($url)
|
||||
{
|
||||
|
@ -96,8 +96,10 @@ class ConsoleLogger extends AbstractLogger
|
||||
* Interpolates context values into the message placeholders
|
||||
*
|
||||
* @author PHP Framework Interoperability Group
|
||||
*
|
||||
* @param string $message
|
||||
* @param array $context
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
private function interpolate($message, array $context)
|
||||
|
@ -213,7 +213,7 @@ class DebugClassLoader
|
||||
chdir($cwd);
|
||||
}
|
||||
|
||||
if ( 0 === substr_compare($real, $tail, -strlen($tail), strlen($tail), true)
|
||||
if (0 === substr_compare($real, $tail, -strlen($tail), strlen($tail), true)
|
||||
&& 0 !== substr_compare($real, $tail, -strlen($tail), strlen($tail), false)
|
||||
) {
|
||||
throw new \RuntimeException(sprintf('Case mismatch between class and source file names: %s vs %s', $class, $real));
|
||||
|
@ -30,7 +30,7 @@ class DecoratorServicePass implements CompilerPassInterface
|
||||
}
|
||||
$definition->setDecoratedService(null);
|
||||
|
||||
list ($inner, $renamedId) = $decorated;
|
||||
list($inner, $renamedId) = $decorated;
|
||||
if (!$renamedId) {
|
||||
$renamedId = $id.'.inner';
|
||||
}
|
||||
|
@ -142,7 +142,7 @@ class XmlDumper extends Dumper
|
||||
$service->setAttribute('lazy', 'true');
|
||||
}
|
||||
if (null !== $decorated = $definition->getDecoratedService()) {
|
||||
list ($decorated, $renamedId) = $decorated;
|
||||
list($decorated, $renamedId) = $decorated;
|
||||
$service->setAttribute('decorates', $decorated);
|
||||
if (null !== $renamedId) {
|
||||
$service->setAttribute('decoration-inner-name', $renamedId);
|
||||
|
@ -140,7 +140,7 @@ class YamlDumper extends Dumper
|
||||
}
|
||||
|
||||
if (null !== $decorated = $definition->getDecoratedService()) {
|
||||
list ($decorated, $renamedId) = $decorated;
|
||||
list($decorated, $renamedId) = $decorated;
|
||||
$code .= sprintf(" decorates: %s\n", $decorated);
|
||||
if (null !== $renamedId) {
|
||||
$code .= sprintf(" decoration_inner_name: %s\n", $renamedId);
|
||||
|
@ -213,7 +213,7 @@ class ViolationMapperTest extends \PHPUnit_Framework_TestCase
|
||||
$violation = $this->getConstraintViolation('children[address].data.street');
|
||||
$parent = $this->getForm('parent');
|
||||
$child = $this->getForm('address', 'address');
|
||||
$grandChild = $this->getForm('street' , 'street');
|
||||
$grandChild = $this->getForm('street', 'street');
|
||||
|
||||
$parent->add($child);
|
||||
$child->add($grandChild);
|
||||
|
@ -13,7 +13,6 @@ namespace Symfony\Component\HttpKernel\EventListener;
|
||||
|
||||
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
|
||||
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
|
||||
use Symfony\Component\HttpKernel\HttpKernelInterface;
|
||||
use Symfony\Component\HttpKernel\KernelEvents;
|
||||
|
||||
/**
|
||||
|
@ -11,8 +11,6 @@
|
||||
|
||||
namespace Symfony\Component\HttpKernel\Tests\Bundle;
|
||||
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Definition;
|
||||
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionAbsentBundle\ExtensionAbsentBundle;
|
||||
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand;
|
||||
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\ExtensionPresentBundle;
|
||||
|
@ -114,6 +114,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
|
||||
* ACL entries have the CASCADE option on their foreign key so they will also get deleted
|
||||
*
|
||||
* @param SecurityIdentityInterface $sid
|
||||
*
|
||||
* @throws \InvalidArgumentException
|
||||
*/
|
||||
public function deleteSecurityIdentity(SecurityIdentityInterface $sid)
|
||||
@ -653,7 +654,9 @@ QUERY;
|
||||
* Constructs the SQL to delete a security identity.
|
||||
*
|
||||
* @param SecurityIdentityInterface $sid
|
||||
*
|
||||
* @throws \InvalidArgumentException
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
protected function getDeleteSecurityIdentityIdSql(SecurityIdentityInterface $sid)
|
||||
@ -693,6 +696,7 @@ QUERY;
|
||||
*
|
||||
* @param UserSecurityIdentity $usid
|
||||
* @param string $oldUsername
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
protected function getUpdateUserSecurityIdentitySql(UserSecurityIdentity $usid, $oldUsername)
|
||||
|
@ -157,7 +157,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
|
||||
$this->securityContext->expects($this->any())->method('getToken')->will($this->returnValue($token));
|
||||
$this->request->expects($this->any())->method('get')->with('_switch_user')->will($this->returnValue('kuba'));
|
||||
$this->request->query->expects($this->once())->method('remove', '_switch_user');
|
||||
$this->request->query->expects($this->any())->method('all')->will($this->returnValue(array('page' => 3,'section' => 2)));
|
||||
$this->request->query->expects($this->any())->method('all')->will($this->returnValue(array('page' => 3, 'section' => 2)));
|
||||
$this->request->expects($this->any())->method('getUri')->will($this->returnValue('/'));
|
||||
$this->request->server->expects($this->once())->method('set')->with('QUERY_STRING', 'page=3§ion=2');
|
||||
|
||||
|
@ -11,10 +11,6 @@
|
||||
|
||||
namespace Symfony\Component\Validator\Violation;
|
||||
|
||||
use Symfony\Component\Translation\TranslatorInterface;
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
use Symfony\Component\Validator\ConstraintViolation;
|
||||
use Symfony\Component\Validator\ConstraintViolationList;
|
||||
use Symfony\Component\Validator\ExecutionContextInterface;
|
||||
use Symfony\Component\Validator\Util\PropertyPath;
|
||||
|
||||
|
Reference in New Issue
Block a user