Merge pull request sonata-project#130 from dramentol/2.0

Update Provider/FileProvider.php

Author: rande

DependencyInjection/Configuration.php

@@ -187,21 +187,27 @@ private function addProvidersSection(ArrayNodeDefinition $node)
                                 ->scalarNode('cdn')->defaultValue('sonata.media.cdn.server')->end()
                                 ->scalarNode('generator')->defaultValue('sonata.media.generator.default')->end()
                                 ->scalarNode('thumbnail')->defaultValue('sonata.media.thumbnail.format')->end()
-                                ->scalarNode('allowed_extensions')->defaultValue(array(
-                                    'pdf', 'txt', 'rtf',
-                                    'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx',
-                                    'odt', 'odg', 'odp', 'ods', 'odc', 'odf', 'odb',
-                                    'csv',
-                                    'xml',
-                                ))->end()
-                                ->scalarNode('allowed_mime_types')->defaultValue(array(
-                                    'application/pdf', 'application/x-pdf', 'application/rtf', 'text/html', 'text/rtf', 'text/plain',
-                                    'application/excel', 'application/msword', 'application/vnd.ms-excel', 'application/vnd.ms-powerpoint',
-                                    'application/vnd.ms-powerpoint', 'application/vnd.oasis.opendocument.text', 'application/vnd.oasis.opendocument.graphics', 'application/vnd.oasis.opendocument.presentation', 'application/vnd.oasis.opendocument.spreadsheet', 'application/vnd.oasis.opendocument.chart', 'application/vnd.oasis.opendocument.formula', 'application/vnd.oasis.opendocument.database', 'application/vnd.oasis.opendocument.image',
-                                    'text/comma-separated-values',
-                                    'text/xml',
-                                    'application/zip', // seems to be used for xlsx document ...
-                                ))->end()
+                                ->arrayNode('allowed_extensions')
+                                    ->prototype('scalar')->end()
+                                    ->defaultValue(array(
+                                        'pdf', 'txt', 'rtf',
+                                        'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pttx',
+                                        'odt', 'odg', 'odp', 'ods', 'odc', 'odf', 'odb',
+                                        'csv',
+                                        'xml',
+                                    ))
+                                ->end()
+                                ->arrayNode('allowed_mime_types')
+                                    ->prototype('scalar')->end()
+                                    ->defaultValue(array(
+                                        'application/pdf', 'application/x-pdf', 'application/rtf', 'text/html', 'text/rtf', 'text/plain',
+                                        'application/excel', 'application/msword', 'application/vnd.ms-excel', 'application/vnd.ms-powerpoint',
+                                        'application/vnd.ms-powerpoint', 'application/vnd.oasis.opendocument.text', 'application/vnd.oasis.opendocument.graphics', 'application/vnd.oasis.opendocument.presentation', 'application/vnd.oasis.opendocument.spreadsheet', 'application/vnd.oasis.opendocument.chart', 'application/vnd.oasis.opendocument.formula', 'application/vnd.oasis.opendocument.database', 'application/vnd.oasis.opendocument.image',
+                                        'text/comma-separated-values',
+                                        'text/xml',
+                                        'application/zip', // seems to be used for xlsx document ...
+                                    ))
+                                ->end()
                             ->end()
                         ->end()
 
@@ -215,15 +221,19 @@ private function addProvidersSection(ArrayNodeDefinition $node)
                                 ->scalarNode('generator')->defaultValue('sonata.media.generator.default')->end()
                                 ->scalarNode('thumbnail')->defaultValue('sonata.media.thumbnail.format')->end()
                                 ->scalarNode('adapter')->defaultValue('sonata.media.adapter.image.gd')->end()
-                                ->scalarNode('allowed_extensions')->defaultValue(array(
-                                    'jpg', 'png'
-                                ))->end()
-                                ->scalarNode('allowed_mime_types')->defaultValue(array(
-                                    'image/pjpeg',
-                                    'image/jpeg',
-                                    'image/png',
-                                    'image/x-png',
-                                ))->end()
+                                ->arrayNode('allowed_extensions')
+                                    ->prototype('scalar')->end()
+                                    ->defaultValue(array('jpg', 'png'))
+                                ->end()
+                                ->arrayNode('allowed_mime_types')
+                                    ->prototype('scalar')->end()
+                                    ->defaultValue(array(
+                                        'image/pjpeg',
+                                        'image/jpeg',
+                                        'image/png',
+                                        'image/x-png',
+                                    ))
+                                ->end()
                             ->end()
                         ->end()
 

DependencyInjection/SonataMediaExtension.php

@@ -118,7 +118,7 @@ public function load(array $configs, ContainerBuilder $container)
     public function configureProviders(ContainerBuilder $container, $config)
     {
         $container->getDefinition('sonata.media.provider.image')
-            ->replaceArgument(5, $config['providers']['image']['allowed_extensions'])
+            ->replaceArgument(5, array_map('strtolower', $config['providers']['image']['allowed_extensions']))
             ->replaceArgument(6, $config['providers']['image']['allowed_mime_types'])
             ->replaceArgument(7, new Reference($config['providers']['image']['adapter']))
         ;

Provider/FileProvider.php

@@ -315,7 +315,7 @@ public function validate(ErrorElement $errorElement, MediaInterface $media)
             $fileName = $media->getBinaryContent()->getFilename();
         }
 
-        if (!in_array(pathinfo($fileName, PATHINFO_EXTENSION), $this->allowedExtensions)) {
+        if (!in_array(strtolower(pathinfo($fileName, PATHINFO_EXTENSION)), $this->allowedExtensions)) {
             $errorElement
                 ->with('binaryContent')
                     ->addViolation('Invalid extensions')