Merge branch '2.3' into 2.5
* 2.3: [2.3] More cs fixes Removed unused imports CS fixes bumped Symfony version to 2.3.24 updated VERSION for 2.3.23 update CONTRIBUTORS for 2.3.23 updated CHANGELOG for 2.3.23 Conflicts: src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
This commit is contained in:
commit
9aff1ec93c
@ -7,6 +7,16 @@ in 2.3 minor versions.
|
||||
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
|
||||
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.3.0...v2.3.1
|
||||
|
||||
* 2.3.23 (2014-12-03)
|
||||
|
||||
* bug #12811 Configure firewall's kernel exception listener with configured entry point or a default entry point (rjkip)
|
||||
* bug #12784 [DependencyInjection] make paths relative to __DIR__ in the generated container (nicolas-grekas)
|
||||
* bug #12716 [ClassLoader] define constant only if it wasn't defined before (xabbuh)
|
||||
* bug #12553 [Debug] fix error message on double exception (nicolas-grekas)
|
||||
* bug #12550 [FrameworkBundle] backport #12489 (xabbuh)
|
||||
* bug #12570 Fix initialized() with aliased services (Daniel Wehner)
|
||||
* bug #12137 [FrameworkBundle] cache:clear command fills *.php.meta files with wrong data (Strate)
|
||||
|
||||
* 2.3.22 (2014-11-20)
|
||||
|
||||
* bug #12525 [Bundle][FrameworkBundle] be smarter when guessing the document root (xabbuh)
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Bridge\Doctrine\DependencyInjection\Security\UserProvider;
|
||||
|
||||
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
|
||||
|
||||
use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider\UserProviderFactoryInterface;
|
||||
use Symfony\Component\DependencyInjection\DefinitionDecorator;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
|
@ -11,9 +11,9 @@
|
||||
|
||||
namespace Symfony\Bridge\Propel1\Form\ChoiceList;
|
||||
|
||||
use \ModelCriteria;
|
||||
use \BaseObject;
|
||||
use \Persistent;
|
||||
use ModelCriteria;
|
||||
use BaseObject;
|
||||
use Persistent;
|
||||
use Symfony\Component\Form\Exception\StringCastException;
|
||||
use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList;
|
||||
use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
namespace Symfony\Bridge\Propel1\Form\DataTransformer;
|
||||
|
||||
use \PropelObjectCollection;
|
||||
use PropelObjectCollection;
|
||||
use Symfony\Component\Form\DataTransformerInterface;
|
||||
use Symfony\Component\Form\Exception\TransformationFailedException;
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
namespace Symfony\Bridge\Propel1\Tests\Fixtures;
|
||||
|
||||
use \PropelPDO;
|
||||
use PropelPDO;
|
||||
|
||||
class Item implements \Persistent
|
||||
{
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
namespace Symfony\Bridge\Propel1\Tests\Form\DataTransformer;
|
||||
|
||||
use \PropelObjectCollection;
|
||||
use PropelObjectCollection;
|
||||
use Symfony\Bridge\Propel1\Form\DataTransformer\CollectionToArrayTransformer;
|
||||
use Symfony\Bridge\Propel1\Tests\Propel1TestCase;
|
||||
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
|
||||
|
||||
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
|
||||
|
||||
use Symfony\Component\DependencyInjection\DefinitionDecorator;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
|
||||
|
||||
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
|
||||
|
||||
use Symfony\Component\DependencyInjection\DefinitionDecorator;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
|
||||
|
||||
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
|
||||
|
||||
use Symfony\Component\DependencyInjection\DefinitionDecorator;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
|
@ -12,9 +12,7 @@
|
||||
namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
|
||||
|
||||
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
|
||||
|
||||
use Symfony\Component\DependencyInjection\DefinitionDecorator;
|
||||
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider;
|
||||
|
||||
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
|
||||
|
||||
use Symfony\Component\DependencyInjection\DefinitionDecorator;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\DependencyInjection;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
|
||||
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Bundle\WebProfilerBundle\Tests\DependencyInjection;
|
||||
|
||||
use Symfony\Bundle\WebProfilerBundle\Tests\TestCase;
|
||||
|
||||
use Symfony\Bundle\WebProfilerBundle\DependencyInjection\WebProfilerExtension;
|
||||
use Symfony\Component\DependencyInjection\Container;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\DependencyInjection\Compiler;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Definition;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Definition;
|
||||
use Symfony\Component\DependencyInjection\Compiler\Compiler;
|
||||
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
|
||||
use Symfony\Component\DependencyInjection\Compiler\RepeatedPass;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
|
@ -12,13 +12,9 @@
|
||||
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Compiler\CheckCircularReferencesPass;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Compiler\Compiler;
|
||||
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
|
||||
class CheckCircularReferencesPassTest extends \PHPUnit_Framework_TestCase
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Definition;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Compiler\CheckExceptionOnInvalidReferenceBehaviorPass;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Scope;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Compiler\CheckReferenceValidityPass;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
|
||||
use Symfony\Component\DependencyInjection\Compiler\Compiler;
|
||||
use Symfony\Component\DependencyInjection\Compiler\RepeatedPass;
|
||||
use Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass;
|
||||
use Symfony\Component\DependencyInjection\Definition;
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\DependencyInjection\Tests\Loader;
|
||||
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
use Symfony\Component\DependencyInjection\Definition;
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
|
||||
|
||||
use Symfony\Component\Form\Exception\TransformationFailedException;
|
||||
|
||||
use Symfony\Component\Form\DataTransformerInterface;
|
||||
use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface;
|
||||
|
||||
|
@ -1784,8 +1784,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
|
||||
$this->assertMatchesXpath($this->renderWidget($form->createView()),
|
||||
'//input[@type="hidden"][@id="_token"][@name="_token"]
|
||||
|
|
||||
//input[@type="text"][@id="child"][@name="child"]'
|
||||
, 2);
|
||||
//input[@type="text"][@id="child"][@name="child"]', 2);
|
||||
}
|
||||
|
||||
public function testButton()
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
|
||||
|
||||
use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList;
|
||||
|
||||
use Symfony\Component\Form\Extension\Core\DataTransformer\ChoicesToValuesTransformer;
|
||||
|
||||
class ChoicesToValuesTransformerTest extends \PHPUnit_Framework_TestCase
|
||||
|
@ -367,7 +367,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
|
||||
$object = $this->getMock('\stdClass');
|
||||
$options = array('validation_groups' => function (FormInterface $form) {
|
||||
return array('group1', 'group2');
|
||||
},);
|
||||
});
|
||||
$form = $this->getBuilder('name', '\stdClass', $options)
|
||||
->setData($object)
|
||||
->getForm();
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\HttpKernel\Tests;
|
||||
|
||||
use Symfony\Component\HttpKernel\Client;
|
||||
use Symfony\Component\HttpKernel\HttpKernel;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||
|
@ -11,15 +11,11 @@
|
||||
|
||||
namespace Symfony\Component\Intl;
|
||||
|
||||
use Symfony\Component\Intl\Data\Bundle\Reader\BundleReaderInterface;
|
||||
use Symfony\Component\Intl\Data\Bundle\Reader\JsonBundleReader;
|
||||
use Symfony\Component\Intl\Data\Bundle\Reader\IntlBundleReader;
|
||||
use Symfony\Component\Intl\Data\Bundle\Reader\BufferedBundleReader;
|
||||
use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReader;
|
||||
use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
|
||||
use Symfony\Component\Intl\Data\Bundle\Reader\PhpBundleReader;
|
||||
use Symfony\Component\Intl\Data\Provider\ScriptDataProvider;
|
||||
use Symfony\Component\Intl\Exception\InvalidArgumentException;
|
||||
use Symfony\Component\Intl\ResourceBundle\CurrencyBundle;
|
||||
use Symfony\Component\Intl\ResourceBundle\CurrencyBundleInterface;
|
||||
use Symfony\Component\Intl\ResourceBundle\LanguageBundle;
|
||||
|
@ -15,7 +15,6 @@ use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
|
||||
use Symfony\Component\Intl\Data\Provider\CurrencyDataProvider;
|
||||
use Symfony\Component\Intl\Data\Provider\LocaleDataProvider;
|
||||
use Symfony\Component\Intl\Exception\MissingResourceException;
|
||||
use Symfony\Component\Intl\Intl;
|
||||
|
||||
/**
|
||||
* Default implementation of {@link CurrencyBundleInterface}.
|
||||
@ -53,7 +52,7 @@ class CurrencyBundle extends CurrencyDataProvider implements CurrencyBundleInter
|
||||
try {
|
||||
return $this->getSymbol($currency, $displayLocale);
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -65,7 +64,7 @@ class CurrencyBundle extends CurrencyDataProvider implements CurrencyBundleInter
|
||||
try {
|
||||
return $this->getName($currency, $displayLocale);
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -77,7 +76,7 @@ class CurrencyBundle extends CurrencyDataProvider implements CurrencyBundleInter
|
||||
try {
|
||||
return $this->getNames($displayLocale);
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -89,7 +88,7 @@ class CurrencyBundle extends CurrencyDataProvider implements CurrencyBundleInter
|
||||
try {
|
||||
return parent::getFractionDigits($currency);
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -101,7 +100,7 @@ class CurrencyBundle extends CurrencyDataProvider implements CurrencyBundleInter
|
||||
try {
|
||||
return parent::getRoundingIncrement($currency);
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -113,7 +112,7 @@ class CurrencyBundle extends CurrencyDataProvider implements CurrencyBundleInter
|
||||
try {
|
||||
return $this->localeProvider->getLocales();
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -16,7 +16,6 @@ use Symfony\Component\Intl\Data\Provider\LanguageDataProvider;
|
||||
use Symfony\Component\Intl\Data\Provider\LocaleDataProvider;
|
||||
use Symfony\Component\Intl\Data\Provider\ScriptDataProvider;
|
||||
use Symfony\Component\Intl\Exception\MissingResourceException;
|
||||
use Symfony\Component\Intl\Intl;
|
||||
|
||||
/**
|
||||
* Default implementation of {@link LanguageBundleInterface}.
|
||||
@ -69,7 +68,7 @@ class LanguageBundle extends LanguageDataProvider implements LanguageBundleInter
|
||||
try {
|
||||
return $this->getName($language, $displayLocale);
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -81,7 +80,7 @@ class LanguageBundle extends LanguageDataProvider implements LanguageBundleInter
|
||||
try {
|
||||
return $this->getNames($displayLocale);
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -93,7 +92,7 @@ class LanguageBundle extends LanguageDataProvider implements LanguageBundleInter
|
||||
try {
|
||||
return $this->scriptProvider->getName($script, $displayLocale);
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -105,7 +104,7 @@ class LanguageBundle extends LanguageDataProvider implements LanguageBundleInter
|
||||
try {
|
||||
return $this->scriptProvider->getNames($displayLocale);
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -117,7 +116,7 @@ class LanguageBundle extends LanguageDataProvider implements LanguageBundleInter
|
||||
try {
|
||||
return $this->localeProvider->getLocales();
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -11,10 +11,8 @@
|
||||
|
||||
namespace Symfony\Component\Intl\ResourceBundle;
|
||||
|
||||
use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
|
||||
use Symfony\Component\Intl\Data\Provider\LocaleDataProvider;
|
||||
use Symfony\Component\Intl\Exception\MissingResourceException;
|
||||
use Symfony\Component\Intl\Intl;
|
||||
|
||||
/**
|
||||
* Default implementation of {@link LocaleBundleInterface}.
|
||||
@ -33,7 +31,7 @@ class LocaleBundle extends LocaleDataProvider implements LocaleBundleInterface
|
||||
try {
|
||||
return parent::getLocales();
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -45,7 +43,7 @@ class LocaleBundle extends LocaleDataProvider implements LocaleBundleInterface
|
||||
try {
|
||||
return $this->getName($locale, $displayLocale);
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -57,7 +55,7 @@ class LocaleBundle extends LocaleDataProvider implements LocaleBundleInterface
|
||||
try {
|
||||
return $this->getNames($displayLocale);
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -15,7 +15,6 @@ use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
|
||||
use Symfony\Component\Intl\Data\Provider\LocaleDataProvider;
|
||||
use Symfony\Component\Intl\Data\Provider\RegionDataProvider;
|
||||
use Symfony\Component\Intl\Exception\MissingResourceException;
|
||||
use Symfony\Component\Intl\Intl;
|
||||
|
||||
/**
|
||||
* Default implementation of {@link RegionBundleInterface}.
|
||||
@ -53,7 +52,7 @@ class RegionBundle extends RegionDataProvider implements RegionBundleInterface
|
||||
try {
|
||||
return $this->getName($country, $displayLocale);
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -65,7 +64,7 @@ class RegionBundle extends RegionDataProvider implements RegionBundleInterface
|
||||
try {
|
||||
return $this->getNames($displayLocale);
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -77,7 +76,7 @@ class RegionBundle extends RegionDataProvider implements RegionBundleInterface
|
||||
try {
|
||||
return $this->localeProvider->getLocales();
|
||||
} catch (MissingResourceException $e) {
|
||||
return null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -76,7 +76,6 @@ foreach ($urls as $urlVersion => $url) {
|
||||
? $urlVersion
|
||||
: $maxVersion;
|
||||
|
||||
|
||||
echo " $urlVersion\n";
|
||||
}
|
||||
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\Security\Acl\Domain;
|
||||
|
||||
use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
|
||||
|
||||
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
|
||||
use Symfony\Component\Security\Acl\Model\SecurityIdentityRetrievalStrategyInterface;
|
||||
use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver;
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\Security\Acl\Tests\Domain;
|
||||
|
||||
use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
|
||||
|
||||
use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
|
||||
use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy;
|
||||
use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
|
||||
|
||||
use Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder;
|
||||
|
||||
use Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider;
|
||||
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
|
||||
|
||||
|
@ -12,9 +12,7 @@
|
||||
namespace Symfony\Component\Security\Core\Tests\User;
|
||||
|
||||
use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
|
||||
|
||||
use Symfony\Component\Security\Core\User\ChainUserProvider;
|
||||
|
||||
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
|
||||
|
||||
class ChainUserProviderTest extends \PHPUnit_Framework_TestCase
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\Security\Http;
|
||||
|
||||
use Symfony\Component\Security\Core\SecurityContextInterface;
|
||||
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\RedirectResponse;
|
||||
use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\Security\Http\Tests\RememberMe;
|
||||
|
||||
use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface;
|
||||
|
||||
use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;
|
||||
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
|
||||
use Symfony\Component\Security\Core\Authentication\RememberMe\PersistentToken;
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\Security\Http\Tests\RememberMe;
|
||||
|
||||
use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface;
|
||||
|
||||
use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;
|
||||
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
|
@ -57,14 +57,13 @@ class StopwatchTest extends \PHPUnit_Framework_TestCase
|
||||
|
||||
$events = new \ReflectionProperty('Symfony\Component\Stopwatch\Section', 'events');
|
||||
$events->setAccessible(true);
|
||||
$events->setValue(
|
||||
end($section),
|
||||
array(
|
||||
'foo' =>
|
||||
$this->getMockBuilder('Symfony\Component\Stopwatch\StopwatchEvent')
|
||||
|
||||
$stopwatchMockEvent = $this->getMockBuilder('Symfony\Component\Stopwatch\StopwatchEvent')
|
||||
->setConstructorArgs(array(microtime(true) * 1000))
|
||||
->getMock())
|
||||
);
|
||||
->getMock()
|
||||
;
|
||||
|
||||
$events->setValue(end($section), array('foo' => $stopwatchMockEvent));
|
||||
|
||||
$this->assertFalse($stopwatch->isStarted('foo'));
|
||||
}
|
||||
|
@ -95,7 +95,7 @@ class ChoiceValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
$constraint = new Choice(array('callback' => function () {
|
||||
return array('foo', 'bar');
|
||||
}, ));
|
||||
}));
|
||||
|
||||
$this->validator->validate('bar', $constraint);
|
||||
|
||||
|
@ -12,7 +12,6 @@
|
||||
namespace Symfony\Component\Yaml\Tests;
|
||||
|
||||
use Symfony\Component\Yaml\Exception\ParseException;
|
||||
use Symfony\Component\Yaml\Yaml;
|
||||
|
||||
class ParseExceptionTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
|
Reference in New Issue
Block a user