Skip to content

Commit

Permalink
Merge branch '3.3' into 3.4
Browse files Browse the repository at this point in the history
* 3.3: (23 commits)
  Tests and fix for issue in array model data in EntityType field with multiple=true
  [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
  removed useless PHPDoc
  [Form] Fix FormInterface::submit() annotation
  [PHPUnitBridge] don't remove when set to  empty string
  PdoSessionHandler: fix advisory lock for pgsql when session.sid_bits_per_character > 4
  HttpCache does not consider ESI resources in HEAD requests
  Fix translation for "This field was not expected"
  [Routing] Enhance Route(Collection) docblocks
  Added improvement for accuracy in MoneyToLocalizedStringTransformer.
  Removed unused private property
  Use correct verb form in the pull request template
  Use PHP_MAXPATHLEN in Filesystem.
  Added null as explicit return type (?TokenInterface)
  [FrameworkBundle] Fix Routing\DelegatingLoader
  Render all line breaks according to the exception message
  [Form] Fix phpdoc
  [DI] remove confusing code
  [Form] Fixed GroupSequence with "constraints" option
  [Validator] Clarify UUID validator behavior
  ...
  • Loading branch information
nicolas-grekas committed Oct 2, 2017
2 parents 5ce4cf5 + 1d189d7 commit 9d9c616
Show file tree
Hide file tree
Showing 15 changed files with 0 additions and 31 deletions.
2 changes: 0 additions & 2 deletions Definition/BaseNode.php
Expand Up @@ -34,8 +34,6 @@ abstract class BaseNode implements NodeInterface
protected $attributes = array();

/**
* Constructor.
*
* @param string $name The name of the node
* @param NodeInterface $parent The parent of this node
*
Expand Down
2 changes: 0 additions & 2 deletions Definition/Builder/ExprBuilder.php
Expand Up @@ -26,8 +26,6 @@ class ExprBuilder
public $thenPart;

/**
* Constructor.
*
* @param NodeDefinition $node The related node
*/
public function __construct(NodeDefinition $node)
Expand Down
2 changes: 0 additions & 2 deletions Definition/Builder/MergeBuilder.php
Expand Up @@ -23,8 +23,6 @@ class MergeBuilder
public $allowOverwrite = true;

/**
* Constructor.
*
* @param NodeDefinition $node The related node
*/
public function __construct(NodeDefinition $node)
Expand Down
3 changes: 0 additions & 3 deletions Definition/Builder/NodeBuilder.php
Expand Up @@ -21,9 +21,6 @@ class NodeBuilder implements NodeParentInterface
protected $parent;
protected $nodeMapping;

/**
* Constructor.
*/
public function __construct()
{
$this->nodeMapping = array(
Expand Down
2 changes: 0 additions & 2 deletions Definition/Builder/NodeDefinition.php
Expand Up @@ -41,8 +41,6 @@ abstract class NodeDefinition implements NodeParentInterface
protected $attributes = array();

/**
* Constructor.
*
* @param string $name The name of the node
* @param NodeParentInterface|null $parent The parent
*/
Expand Down
2 changes: 0 additions & 2 deletions Definition/Builder/NormalizationBuilder.php
Expand Up @@ -23,8 +23,6 @@ class NormalizationBuilder
public $remappings = array();

/**
* Constructor.
*
* @param NodeDefinition $node The related node
*/
public function __construct(NodeDefinition $node)
Expand Down
2 changes: 0 additions & 2 deletions Definition/Builder/ValidationBuilder.php
Expand Up @@ -22,8 +22,6 @@ class ValidationBuilder
public $rules = array();

/**
* Constructor.
*
* @param NodeDefinition $node The related node
*/
public function __construct(NodeDefinition $node)
Expand Down
2 changes: 0 additions & 2 deletions FileLocator.php
Expand Up @@ -23,8 +23,6 @@ class FileLocator implements FileLocatorInterface
protected $paths;

/**
* Constructor.
*
* @param string|array $paths A path or an array of paths where to look for resources
*/
public function __construct($paths = array())
Expand Down
2 changes: 0 additions & 2 deletions Loader/DelegatingLoader.php
Expand Up @@ -24,8 +24,6 @@
class DelegatingLoader extends Loader
{
/**
* Constructor.
*
* @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
*/
public function __construct(LoaderResolverInterface $resolver)
Expand Down
2 changes: 0 additions & 2 deletions Loader/FileLoader.php
Expand Up @@ -38,8 +38,6 @@ abstract class FileLoader extends Loader
private $currentDir;

/**
* Constructor.
*
* @param FileLocatorInterface $locator A FileLocatorInterface instance
*/
public function __construct(FileLocatorInterface $locator)
Expand Down
2 changes: 0 additions & 2 deletions Loader/LoaderResolver.php
Expand Up @@ -27,8 +27,6 @@ class LoaderResolver implements LoaderResolverInterface
private $loaders = array();

/**
* Constructor.
*
* @param LoaderInterface[] $loaders An array of loaders
*/
public function __construct(array $loaders = array())
Expand Down
2 changes: 0 additions & 2 deletions Resource/DirectoryResource.php
Expand Up @@ -22,8 +22,6 @@ class DirectoryResource implements SelfCheckingResourceInterface, \Serializable
private $pattern;

/**
* Constructor.
*
* @param string $resource The file path to the resource
* @param string|null $pattern A pattern to restrict monitored files
*
Expand Down
2 changes: 0 additions & 2 deletions Resource/FileExistenceResource.php
Expand Up @@ -26,8 +26,6 @@ class FileExistenceResource implements SelfCheckingResourceInterface, \Serializa
private $exists;

/**
* Constructor.
*
* @param string $resource The file path to the resource
*/
public function __construct($resource)
Expand Down
2 changes: 0 additions & 2 deletions Resource/FileResource.php
Expand Up @@ -26,8 +26,6 @@ class FileResource implements SelfCheckingResourceInterface, \Serializable
private $resource;

/**
* Constructor.
*
* @param string $resource The file path to the resource
*
* @throws \InvalidArgumentException
Expand Down
2 changes: 0 additions & 2 deletions Resource/GlobResource.php
Expand Up @@ -29,8 +29,6 @@ class GlobResource implements \IteratorAggregate, SelfCheckingResourceInterface,
private $hash;

/**
* Constructor.
*
* @param string $prefix A directory prefix
* @param string $pattern A glob pattern
* @param bool $recursive Whether directories should be scanned recursively or not
Expand Down

0 comments on commit 9d9c616

Please sign in to comment.