Merge branch '3.4' into 4.1
* 3.4: the string "0" is a valid service identifier remove unreachable code updated MimeType extensions
This commit is contained in:
commit
55c871d56a
@ -49,12 +49,8 @@ class TransNodeTest extends TestCase
|
|||||||
|
|
||||||
protected function getVariableGetterWithStrictCheck($name)
|
protected function getVariableGetterWithStrictCheck($name)
|
||||||
{
|
{
|
||||||
if (Environment::VERSION_ID > 20404) {
|
|
||||||
return sprintf('(isset($context["%s"]) || array_key_exists("%1$s", $context) ? $context["%1$s"] : (function () { throw new Twig_Error_Runtime(\'Variable "%1$s" does not exist.\', 0, $this->source); })())', $name);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Environment::MAJOR_VERSION >= 2) {
|
if (Environment::MAJOR_VERSION >= 2) {
|
||||||
return sprintf('(isset($context["%s"]) || array_key_exists("%1$s", $context) ? $context["%1$s"] : (function () { throw new Twig_Error_Runtime(\'Variable "%1$s" does not exist.\', 0, $this->getSourceContext()); })())', $name);
|
return sprintf('(isset($context["%s"]) || array_key_exists("%1$s", $context) ? $context["%1$s"] : (function () { throw new Twig_Error_Runtime(\'Variable "%1$s" does not exist.\', 0, $this->source); })())', $name);
|
||||||
}
|
}
|
||||||
|
|
||||||
return sprintf('($context["%s"] ?? $this->getContext($context, "%1$s"))', $name);
|
return sprintf('($context["%s"] ?? $this->getContext($context, "%1$s"))', $name);
|
||||||
|
@ -482,7 +482,7 @@ class XmlFileLoader extends FileLoader
|
|||||||
|
|
||||||
switch ($arg->getAttribute('type')) {
|
switch ($arg->getAttribute('type')) {
|
||||||
case 'service':
|
case 'service':
|
||||||
if (!$arg->getAttribute('id')) {
|
if ('' === $arg->getAttribute('id')) {
|
||||||
throw new InvalidArgumentException(sprintf('Tag "<%s>" with type="service" has no or empty "id" attribute in "%s".', $name, $file));
|
throw new InvalidArgumentException(sprintf('Tag "<%s>" with type="service" has no or empty "id" attribute in "%s".', $name, $file));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -538,7 +538,7 @@ class XmlFileLoader extends FileLoader
|
|||||||
* @param \DOMNode $node
|
* @param \DOMNode $node
|
||||||
* @param mixed $name
|
* @param mixed $name
|
||||||
*
|
*
|
||||||
* @return array
|
* @return \DOMElement[]
|
||||||
*/
|
*/
|
||||||
private function getChildren(\DOMNode $node, $name)
|
private function getChildren(\DOMNode $node, $name)
|
||||||
{
|
{
|
||||||
|
@ -61,5 +61,9 @@
|
|||||||
</service>
|
</service>
|
||||||
<service id="alias_for_foo" alias="foo" />
|
<service id="alias_for_foo" alias="foo" />
|
||||||
<service id="another_alias_for_foo" alias="foo" public="false" />
|
<service id="another_alias_for_foo" alias="foo" public="false" />
|
||||||
|
<service id="0" class="FooClass" />
|
||||||
|
<service id="1" class="FooClass">
|
||||||
|
<argument type="service" id="0" />
|
||||||
|
</service>
|
||||||
</services>
|
</services>
|
||||||
</container>
|
</container>
|
||||||
|
@ -20,11 +20,11 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
|
|||||||
* A map of mime types and their default extensions.
|
* A map of mime types and their default extensions.
|
||||||
*
|
*
|
||||||
* This list has been placed under the public domain by the Apache HTTPD project.
|
* This list has been placed under the public domain by the Apache HTTPD project.
|
||||||
* This list has been updated from upstream on 2013-04-23.
|
* This list has been updated from upstream on 2019-01-14.
|
||||||
*
|
*
|
||||||
* @see http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
|
* @see https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
|
||||||
*/
|
*/
|
||||||
protected $defaultExtensions = array(
|
protected $defaultExtensions = [
|
||||||
'application/andrew-inset' => 'ez',
|
'application/andrew-inset' => 'ez',
|
||||||
'application/applixware' => 'aw',
|
'application/applixware' => 'aw',
|
||||||
'application/atom+xml' => 'atom',
|
'application/atom+xml' => 'atom',
|
||||||
@ -618,7 +618,7 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
|
|||||||
'audio/adpcm' => 'adp',
|
'audio/adpcm' => 'adp',
|
||||||
'audio/basic' => 'au',
|
'audio/basic' => 'au',
|
||||||
'audio/midi' => 'mid',
|
'audio/midi' => 'mid',
|
||||||
'audio/mp4' => 'mp4a',
|
'audio/mp4' => 'm4a',
|
||||||
'audio/mpeg' => 'mpga',
|
'audio/mpeg' => 'mpga',
|
||||||
'audio/ogg' => 'oga',
|
'audio/ogg' => 'oga',
|
||||||
'audio/s3m' => 's3m',
|
'audio/s3m' => 's3m',
|
||||||
@ -653,6 +653,11 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
|
|||||||
'chemical/x-cml' => 'cml',
|
'chemical/x-cml' => 'cml',
|
||||||
'chemical/x-csml' => 'csml',
|
'chemical/x-csml' => 'csml',
|
||||||
'chemical/x-xyz' => 'xyz',
|
'chemical/x-xyz' => 'xyz',
|
||||||
|
'font/collection' => 'ttc',
|
||||||
|
'font/otf' => 'otf',
|
||||||
|
'font/ttf' => 'ttf',
|
||||||
|
'font/woff' => 'woff',
|
||||||
|
'font/woff2' => 'woff2',
|
||||||
'image/bmp' => 'bmp',
|
'image/bmp' => 'bmp',
|
||||||
'image/x-ms-bmp' => 'bmp',
|
'image/x-ms-bmp' => 'bmp',
|
||||||
'image/cgm' => 'cgm',
|
'image/cgm' => 'cgm',
|
||||||
@ -669,8 +674,8 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
|
|||||||
'image/tiff' => 'tiff',
|
'image/tiff' => 'tiff',
|
||||||
'image/vnd.adobe.photoshop' => 'psd',
|
'image/vnd.adobe.photoshop' => 'psd',
|
||||||
'image/vnd.dece.graphic' => 'uvi',
|
'image/vnd.dece.graphic' => 'uvi',
|
||||||
'image/vnd.dvb.subtitle' => 'sub',
|
|
||||||
'image/vnd.djvu' => 'djvu',
|
'image/vnd.djvu' => 'djvu',
|
||||||
|
'image/vnd.dvb.subtitle' => 'sub',
|
||||||
'image/vnd.dwg' => 'dwg',
|
'image/vnd.dwg' => 'dwg',
|
||||||
'image/vnd.dxf' => 'dxf',
|
'image/vnd.dxf' => 'dxf',
|
||||||
'image/vnd.fastbidsheet' => 'fbs',
|
'image/vnd.fastbidsheet' => 'fbs',
|
||||||
@ -732,8 +737,8 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
|
|||||||
'text/vcard' => 'vcard',
|
'text/vcard' => 'vcard',
|
||||||
'text/vnd.curl' => 'curl',
|
'text/vnd.curl' => 'curl',
|
||||||
'text/vnd.curl.dcurl' => 'dcurl',
|
'text/vnd.curl.dcurl' => 'dcurl',
|
||||||
'text/vnd.curl.scurl' => 'scurl',
|
|
||||||
'text/vnd.curl.mcurl' => 'mcurl',
|
'text/vnd.curl.mcurl' => 'mcurl',
|
||||||
|
'text/vnd.curl.scurl' => 'scurl',
|
||||||
'text/vnd.dvb.subtitle' => 'sub',
|
'text/vnd.dvb.subtitle' => 'sub',
|
||||||
'text/vnd.fly' => 'fly',
|
'text/vnd.fly' => 'fly',
|
||||||
'text/vnd.fmi.flexstor' => 'flx',
|
'text/vnd.fmi.flexstor' => 'flx',
|
||||||
@ -747,10 +752,10 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
|
|||||||
'text/x-asm' => 's',
|
'text/x-asm' => 's',
|
||||||
'text/x-c' => 'c',
|
'text/x-c' => 'c',
|
||||||
'text/x-fortran' => 'f',
|
'text/x-fortran' => 'f',
|
||||||
'text/x-pascal' => 'p',
|
|
||||||
'text/x-java-source' => 'java',
|
'text/x-java-source' => 'java',
|
||||||
'text/x-opml' => 'opml',
|
|
||||||
'text/x-nfo' => 'nfo',
|
'text/x-nfo' => 'nfo',
|
||||||
|
'text/x-opml' => 'opml',
|
||||||
|
'text/x-pascal' => 'p',
|
||||||
'text/x-setext' => 'etx',
|
'text/x-setext' => 'etx',
|
||||||
'text/x-sfv' => 'sfv',
|
'text/x-sfv' => 'sfv',
|
||||||
'text/x-uuencode' => 'uu',
|
'text/x-uuencode' => 'uu',
|
||||||
@ -796,7 +801,7 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
|
|||||||
'video/x-sgi-movie' => 'movie',
|
'video/x-sgi-movie' => 'movie',
|
||||||
'video/x-smv' => 'smv',
|
'video/x-smv' => 'smv',
|
||||||
'x-conference/x-cooltalk' => 'ice',
|
'x-conference/x-cooltalk' => 'ice',
|
||||||
);
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
|
Reference in New Issue
Block a user