Merge branch '2.7' into 2.8
* 2.7: fixed some deprecation messages
This commit is contained in:
commit
e78ca822c4
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
namespace Symfony\Bundle\FrameworkBundle\Templating\Asset;
|
namespace Symfony\Bundle\FrameworkBundle\Templating\Asset;
|
||||||
|
|
||||||
@trigger_error('The Symfony\Bundle\FrameworkBundle\Templating\Asset\PackageFactory is deprecated since version 2.7 and will be removed in 3.0. Use the Asset component instead.', E_USER_DEPRECATED);
|
@trigger_error('The Symfony\Bundle\FrameworkBundle\Templating\Asset\PackageFactory is deprecated since Symfony 2.7 and will be removed in 3.0. Use the Asset component instead.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
@ -14,7 +14,7 @@ namespace Symfony\Bundle\FrameworkBundle\Templating\Asset;
|
|||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\Templating\Asset\PathPackage as BasePathPackage;
|
use Symfony\Component\Templating\Asset\PathPackage as BasePathPackage;
|
||||||
|
|
||||||
@trigger_error('The Symfony\Bundle\FrameworkBundle\Templating\Asset\PathPackage is deprecated since version 2.7 and will be removed in 3.0. Use the Asset component instead.', E_USER_DEPRECATED);
|
@trigger_error('The Symfony\Bundle\FrameworkBundle\Templating\Asset\PathPackage is deprecated since Symfony 2.7 and will be removed in 3.0. Use the Asset component instead.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The path packages adds a version and a base path to asset URLs.
|
* The path packages adds a version and a base path to asset URLs.
|
||||||
|
@ -66,7 +66,7 @@ class AssetsHelper extends Helper
|
|||||||
{
|
{
|
||||||
// no arguments means old getVersion() for default package
|
// no arguments means old getVersion() for default package
|
||||||
if (null === $path) {
|
if (null === $path) {
|
||||||
@trigger_error('The getVersion() method requires a path as a first argument since 2.7 and will be enforced as of 3.0.', E_USER_DEPRECATED);
|
@trigger_error('The getVersion() method requires a path as a first argument since Symfony 2.7 and will be enforced as of 3.0.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
return $this->packages->getVersion('/', $packageName);
|
return $this->packages->getVersion('/', $packageName);
|
||||||
}
|
}
|
||||||
@ -85,7 +85,7 @@ class AssetsHelper extends Helper
|
|||||||
}
|
}
|
||||||
|
|
||||||
// path is a packageName, old version
|
// path is a packageName, old version
|
||||||
@trigger_error('The getVersion() method requires a path as a first argument since 2.7 and will be enforced as of 3.0.', E_USER_DEPRECATED);
|
@trigger_error('The getVersion() method requires a path as a first argument since Symfony 2.7 and will be enforced as of 3.0.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
return $this->packages->getVersion('/', $path);
|
return $this->packages->getVersion('/', $path);
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
namespace Symfony\Bundle\TwigBundle\Extension;
|
namespace Symfony\Bundle\TwigBundle\Extension;
|
||||||
|
|
||||||
@trigger_error('The '.__NAMESPACE__.'\AssetsExtension class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Bridge\Twig\Extension\AssetExtension class instead.', E_USER_DEPRECATED);
|
@trigger_error('The '.__NAMESPACE__.'\AssetsExtension class is deprecated since Symfony 2.7 and will be removed in 3.0. Use the Symfony\Bridge\Twig\Extension\AssetExtension class instead.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||||
use Symfony\Component\Routing\RequestContext;
|
use Symfony\Component\Routing\RequestContext;
|
||||||
|
@ -55,7 +55,7 @@ class ConfigCache extends ResourceCheckerConfigCache
|
|||||||
*/
|
*/
|
||||||
public function __toString()
|
public function __toString()
|
||||||
{
|
{
|
||||||
@trigger_error('ConfigCache::__toString() is deprecated since version 2.7 and will be removed in 3.0. Use the getPath() method instead.', E_USER_DEPRECATED);
|
@trigger_error('ConfigCache::__toString() is deprecated since Symfony 2.7 and will be removed in 3.0. Use the getPath() method instead.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
return $this->getPath();
|
return $this->getPath();
|
||||||
}
|
}
|
||||||
|
@ -507,7 +507,7 @@ class Form implements \IteratorAggregate, FormInterface
|
|||||||
public function submit($submittedData, $clearMissing = true)
|
public function submit($submittedData, $clearMissing = true)
|
||||||
{
|
{
|
||||||
if ($submittedData instanceof Request) {
|
if ($submittedData instanceof Request) {
|
||||||
@trigger_error('Passing a Symfony\Component\HttpFoundation\Request object to the '.__CLASS__.'::bind and '.__METHOD__.' methods is deprecated since 2.3 and will be removed in 3.0. Use the '.__CLASS__.'::handleRequest method instead. If you want to test whether the form was submitted separately, you can use the '.__CLASS__.'::isSubmitted method.', E_USER_DEPRECATED);
|
@trigger_error('Passing a Symfony\Component\HttpFoundation\Request object to the '.__CLASS__.'::bind and '.__METHOD__.' methods is deprecated since Symfony 2.3 and will be removed in 3.0. Use the '.__CLASS__.'::handleRequest method instead. If you want to test whether the form was submitted separately, you can use the '.__CLASS__.'::isSubmitted method.', E_USER_DEPRECATED);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->submitted) {
|
if ($this->submitted) {
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Templating\Asset;
|
namespace Symfony\Component\Templating\Asset;
|
||||||
|
|
||||||
@trigger_error('The Symfony\Component\Templating\Asset\Package is deprecated since version 2.7 and will be removed in 3.0. Use the Asset component instead.', E_USER_DEPRECATED);
|
@trigger_error('The Symfony\Component\Templating\Asset\Package is deprecated since Symfony 2.7 and will be removed in 3.0. Use the Asset component instead.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The basic package will add a version to asset URLs.
|
* The basic package will add a version to asset URLs.
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Templating\Asset;
|
namespace Symfony\Component\Templating\Asset;
|
||||||
|
|
||||||
@trigger_error('The Symfony\Component\Templating\Asset\PathPackage is deprecated since version 2.7 and will be removed in 3.0. Use the Asset component instead.', E_USER_DEPRECATED);
|
@trigger_error('The Symfony\Component\Templating\Asset\PathPackage is deprecated since Symfony 2.7 and will be removed in 3.0. Use the Asset component instead.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The path packages adds a version and a base path to asset URLs.
|
* The path packages adds a version and a base path to asset URLs.
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Templating\Asset;
|
namespace Symfony\Component\Templating\Asset;
|
||||||
|
|
||||||
@trigger_error('The Symfony\Component\Templating\Asset\UrlPackage is deprecated since version 2.7 and will be removed in 3.0. Use the Asset component instead.', E_USER_DEPRECATED);
|
@trigger_error('The Symfony\Component\Templating\Asset\UrlPackage is deprecated since Symfony 2.7 and will be removed in 3.0. Use the Asset component instead.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The URL packages adds a version and a base URL to asset URLs.
|
* The URL packages adds a version and a base URL to asset URLs.
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Templating\Helper;
|
namespace Symfony\Component\Templating\Helper;
|
||||||
|
|
||||||
@trigger_error('The Symfony\Component\Templating\Helper\AssetsHelper is deprecated since version 2.7 and will be removed in 3.0. Use the Asset component instead.', E_USER_DEPRECATED);
|
@trigger_error('The Symfony\Component\Templating\Helper\AssetsHelper is deprecated since Symfony 2.7 and will be removed in 3.0. Use the Asset component instead.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
use Symfony\Component\Templating\Asset\PathPackage;
|
use Symfony\Component\Templating\Asset\PathPackage;
|
||||||
use Symfony\Component\Templating\Asset\UrlPackage;
|
use Symfony\Component\Templating\Asset\UrlPackage;
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Templating\Helper;
|
namespace Symfony\Component\Templating\Helper;
|
||||||
|
|
||||||
@trigger_error('The Symfony\Component\Templating\Helper\CoreAssetsHelper is deprecated since version 2.7 and will be removed in 3.0. Use the Asset component instead.', E_USER_DEPRECATED);
|
@trigger_error('The Symfony\Component\Templating\Helper\CoreAssetsHelper is deprecated since Symfony 2.7 and will be removed in 3.0. Use the Asset component instead.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
use Symfony\Component\Templating\Asset\PackageInterface;
|
use Symfony\Component\Templating\Asset\PackageInterface;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user