50 Commits

Author SHA1 Message Date
Fabien Potencier
49540771c5 Merge branch '2.3' into 2.5
* 2.3:
  fix phpdoc's alignment
  Minor phpcs fixes
  [ClassLoader] Fix undefined index in ClassCollectionLoader

Conflicts:
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
2014-12-08 09:43:12 +01:00
Szijarto Tamas
e2a07cb502 [ClassLoader] Fix undefined index in ClassCollectionLoader 2014-12-04 22:06:34 +01:00
Fabien Potencier
50908eb16c Merge branch '2.3' into 2.5
* 2.3:
  Configure firewall's kernel exception listener with configured entry point or a default entry point
  PSR-2 fixes
  [DependencyInjection] make paths relative to __DIR__ in the generated container
  Fixed the syntax of a composer.json file
  Fixed the symfony/config version constraint
  Tweaked the password-compat version constraint
  Docblock fixes
  define constant only if it wasn't defined before
  Fix incorrect spanish translation
  Fixed typos

Conflicts:
	composer.json
	src/Symfony/Bridge/Twig/TwigEngine.php
	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
	src/Symfony/Component/HttpFoundation/Response.php
	src/Symfony/Component/HttpFoundation/StreamedResponse.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
	src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
	src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	src/Symfony/Component/Stopwatch/StopwatchEvent.php
	src/Symfony/Component/Stopwatch/StopwatchPeriod.php
	src/Symfony/Component/Templating/PhpEngine.php
	src/Symfony/Component/Templating/TemplateReference.php
	src/Symfony/Component/Templating/TemplateReferenceInterface.php
	src/Symfony/Component/Translation/TranslatorInterface.php
	src/Symfony/Component/Validator/ConstraintViolation.php
	src/Symfony/Component/Validator/ExecutionContextInterface.php
	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
	src/Symfony/Component/Validator/MetadataFactoryInterface.php
2014-12-02 21:15:53 +01:00
Graham Campbell
307598c291 Docblock fixes 2014-11-30 13:33:44 +00:00
Fabien Potencier
87cc2d71d1 Merge branch '2.3' into 2.4
* 2.3:
  made {@inheritdoc} annotations consistent across the board
  fixed types in phpdocs
  made phpdoc types consistent with those defined in Hack
  Add support Thai translations
  made types consistent with those defined in Hack
  removed extra/unsupported arguments
  [HttpKernel] fixed an error message
  [TwigBundle] removed undefined argument
  [Translation] Make IcuDatFileLoader/IcuResFileLoader::load invalid resource compatible with HHVM.

Conflicts:
	src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
	src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
	src/Symfony/Component/Config/Definition/ReferenceDumper.php
	src/Symfony/Component/Console/Helper/DescriptorHelper.php
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
	src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
	src/Symfony/Component/HttpFoundation/Response.php
	src/Symfony/Component/HttpFoundation/StreamedResponse.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
	src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
	src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
	src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
	src/Symfony/Component/Stopwatch/StopwatchPeriod.php
	src/Symfony/Component/Translation/TranslatorInterface.php
	src/Symfony/Component/Validator/ConstraintValidatorFactory.php
2014-04-16 10:02:57 +02:00
Fabien Potencier
dd8c297b91 made phpdoc types consistent with those defined in Hack 2014-04-15 07:41:45 +02:00
Fabien Potencier
26de2f175f made types consistent with those defined in Hack 2014-04-13 20:00:14 +02:00
Jean-François Simon
c1ae3ba1b3 Replace sha1 and md5 hashing with sha256 algorithm 2013-08-31 13:25:41 +02:00
Tobias Schultze
fa3394c6fd [ClassLoader] tiny refactoring 2013-05-24 19:54:44 +02:00
Fabien Potencier
1c37a180ab [ClassLoader] fixed heredocs handling
The end of an hereodc must have a newline to avoid PHP syntax errors.
2013-03-19 09:32:26 +01:00
Fabien Potencier
1fe171b104 fixed handling of heredocs 2013-03-19 09:20:23 +01:00
Fabien Potencier
dc06308090 fixed CS 2013-03-01 11:42:10 +01:00
Victor Berchet
66599a59d7 Classcollectionloader: fix traits + enhancements 2013-02-01 15:12:50 +01:00
Thomas Lallement
439c25836a CS Fixes - Replaced "array of type" by "Type[]" in PHPDoc block 2012-11-19 13:58:52 +01:00
Fabien Potencier
2d1cdaebc9 Merge branch '2.1'
* 2.1:
  [ClassLoader] fixed unbracketed namespaces (closes #5747)
  slight refactoring in UrlMatcher
  [Form] Created test for DoctrineOrmTypeGuesser see #5790
  [Form] Fixed DoctrineOrmTypeGuesser to guess the "required" option for to-one associations
2012-10-27 17:59:37 +02:00
Fabien Potencier
d095c397b0 Merge branch '2.0' into 2.1
* 2.0:
  [ClassLoader] fixed unbracketed namespaces (closes #5747)

Conflicts:
	src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
	tests/Symfony/Tests/Component/ClassLoader/ClassCollectionLoaderTest.php
2012-10-27 17:59:21 +02:00
Fabien Potencier
c393e86a03 [ClassLoader] fixed unbracketed namespaces (closes #5747) 2012-10-27 17:55:46 +02:00
Fabien Potencier
8a43fc467a [ClassLoader] added some tests for previous merge 2012-10-27 17:07:38 +02:00
Bilal Amarni
438613c948 fixed comment striping on global namespace classes 2012-10-14 13:45:05 +02:00
Fabien Potencier
9c929006d1 [ClassLoader] fixed order of interfaces in generated class collection caches (closes #4841) 2012-07-10 20:28:16 +02:00
Fabien Potencier
5256043be3 fixed CS 2012-07-09 14:54:20 +02:00
Fabien Potencier
475b92bd71 fixed CS (mainly method signatures) 2012-07-09 14:43:50 +02:00
Fabien Potencier
685dd1205c [ClassLoader] made ClassCollectionLoader::load() automatically include class dependencies 2012-07-04 15:19:35 +02:00
Fabien Potencier
ddc88875d1 [ClassLoader] added missing support for PHP 5.4 traits 2012-07-03 19:09:11 +02:00
Bilal Amarni
a04dde5a05 [ClassLoader] ordered ClassCollectionLoader writing to avoid redeclaration at runtime 2012-07-03 14:40:59 +02:00
Fabien Potencier
c57e62c886 added @ to all chmod() calls to avoid PHP warnings (operation not permitted) when using CIFS or NTFSa (closes #2125) 2012-05-15 08:44:52 +02:00
Fabien Potencier
0b8b41c5f2 fixed CS 2012-05-01 15:23:48 +02:00
Fabien Potencier
e3a3ef91f6 merged 2.0 2012-04-25 12:18:06 +02:00
Włodzimierz Gajda
6329e84c2d [2.0][Component][ClassLoader] cs 2012-04-23 07:37:21 +02:00
Victor Berchet
a0a86c4c20 Fix umasks in chmod() calls 2012-04-19 15:47:04 +02:00
Jordi Boggiano
f43106451b Fix chmod() calls to apply umask 2012-04-19 13:35:17 +02:00
Joseph Rouff
eecb8930cf Fix #3929 2012-04-19 12:10:32 +02:00
Fabien Potencier
7605b09f69 merged 2.0 2011-09-28 16:08:31 +02:00
Josef Cech
b6a0da1a46 [ClassLoader] Fixed state when trait_exists doesn't exists 2011-09-25 19:25:50 +02:00
Fabien Potencier
c328278b36 merged 2.0 2011-09-23 21:10:42 +02:00
Fabien Potencier
2f6e0035ea [ClassLoader] added support for PHP 5.4 traits 2011-09-22 09:31:50 +02:00
Fabien Potencier
c6336b856e converted file_exists calls to either is_file or is_dir where it makes sense 2011-08-29 15:28:26 +02:00
Fabien Potencier
c19e76fe58 [ClassLoader] removed obsolete code 2011-07-21 23:27:21 +02:00
Fabien Potencier
6894a17bb8 [ClassLoader] made another performance improvement 2011-06-17 14:15:14 +02:00
Fabien Potencier
96b7979358 [ClassLoader] made a big performance improvement 2011-06-17 14:11:55 +02:00
Fabien Potencier
2a0e3f68f8 [ClassLoader] made a small change to be consistent with the previous change 2011-03-14 18:46:05 +01:00
Fabien Potencier
f6ee7c818a Merge remote branch 'lsmith77/classcollectionloader'
* lsmith77/classcollectionloader:
  make it possible to define the file extension
2011-03-09 17:40:38 +01:00
Fabien Potencier
a1dbe3607b [ClassLoader] moved most protected methods and properties to private 2011-03-08 20:55:22 +01:00
Fabien Potencier
03645603c8 replaced symfony-project.org by symfony.com 2011-03-06 12:40:06 +01:00
Lukas Kahwe Smith
5822ecea34 make it possible to define the file extension 2011-02-26 23:12:46 +01:00
Tim Nagel
ad17481f08 PHPDoc style fix 2011-02-07 01:02:56 +01:00
Tim Nagel
e1c74d7037 PHPDoc fixes 2011-02-07 00:44:48 +01:00
Tim Nagel
7af6c900bf Classloader PHPDoc 2011-02-07 00:44:48 +01:00
Fabien Potencier
72153e3826 reverted changes to the adaptive cache loader cache 2011-01-29 17:58:40 +01:00
Fabien Potencier
bfaf58e2be moved ClassLoaderCollection class to the ClassLoader component 2011-01-27 14:11:54 +01:00