Completed
Pull Request — master (#9)
by Alexis
02:39
created
DataFixtures/ORM/MediaProvider.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -56,17 +56,17 @@  discard block
 block discarded – undo
56 56
             $url .= 'g/';
57 57
         }
58 58
 
59
-        $url .= $dimensions['w'] . '/' . $dimensions['h'];
59
+        $url .= $dimensions['w'].'/'.$dimensions['h'];
60 60
 
61 61
         $category = ['abstract', 'city', 'nature', 'moutains'];
62
-        $url .= '/' . $category[array_rand($category, 1)] . '/';
62
+        $url .= '/'.$category[array_rand($category, 1)].'/';
63 63
 
64 64
         return $url;
65 65
     }
66 66
 
67 67
     protected function downloadMedia($url)
68 68
     {
69
-        $filepath = sys_get_temp_dir() . '/' . uniqid() . '.jpg';
69
+        $filepath = sys_get_temp_dir().'/'.uniqid().'.jpg';
70 70
         $ch = curl_init($url);
71 71
         $fp = fopen($filepath, 'wb');
72 72
         curl_setopt($ch, CURLOPT_FILE, $fp);
@@ -81,16 +81,16 @@  discard block
 block discarded – undo
81 81
     protected function fetchFromCache($dimensions)
82 82
     {
83 83
         $fs = new Filesystem();
84
-        $cacheDir = $_SERVER['HOME'] . '/.symfony/media';
84
+        $cacheDir = $_SERVER['HOME'].'/.symfony/media';
85 85
         if (!$fs->exists($cacheDir)) {
86 86
             $fs->mkdir($cacheDir, 0777);
87 87
         } else {
88
-            $cacheDir .= '/' . $dimensions['w'] . '-' . $dimensions['h'];
88
+            $cacheDir .= '/'.$dimensions['w'].'-'.$dimensions['h'];
89 89
             if (!$fs->exists($cacheDir)) {
90 90
                 $fs->mkdir($cacheDir, 0777);
91 91
             } else {
92 92
                 $finder = new Finder();
93
-                $files = $finder->in($cacheDir . '/')->files();
93
+                $files = $finder->in($cacheDir.'/')->files();
94 94
                 if ($files->count() === 3) {
95 95
                     $iterator = $finder->getIterator();
96 96
                     $iterator->rewind();
@@ -109,11 +109,11 @@  discard block
 block discarded – undo
109 109
     protected function storeInCache($dimensions, File $file)
110 110
     {
111 111
         $fs = new Filesystem();
112
-        $cacheDir = $_SERVER['HOME'] . '/.symfony/media/' . $dimensions['w'] . '-' . $dimensions['h'];
112
+        $cacheDir = $_SERVER['HOME'].'/.symfony/media/'.$dimensions['w'].'-'.$dimensions['h'];
113 113
         if (!$fs->exists($cacheDir)) {
114 114
             $fs->mkdir($cacheDir, 0777);
115 115
         }
116
-        $fs->copy($file->getRealPath(), $cacheDir . '/' . $file->getFilename());
116
+        $fs->copy($file->getRealPath(), $cacheDir.'/'.$file->getFilename());
117 117
     }
118 118
 
119 119
 }
Please login to merge, or discard this patch.
Controller/MediaController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
         $response = new Response();
80 80
         $response->setContent(file_get_contents($this->get('alpixel_media.manager')->getAbsolutePath($media)));
81 81
         $response->headers->set('Content-Type', 'application/force-download');
82
-        $response->headers->set('Content-disposition', 'filename=' . $media->getName());
82
+        $response->headers->set('Content-disposition', 'filename='.$media->getName());
83 83
 
84 84
         return $response;
85 85
     }
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
         $isImage = @getimagesize($src);
102 102
 
103 103
         if ($isImage) {
104
-            $response->headers->set('Content-disposition', 'inline;filename=' . $media->getName());
104
+            $response->headers->set('Content-disposition', 'inline;filename='.$media->getName());
105 105
             if (!empty($filter) && $isImage) {
106 106
                 $src = $this->get('alpixel_media.manager')->getAbsolutePath($media, $filter);
107 107
                 $dataManager = $this->get('liip_imagine.data.manager'); // the data manager service
@@ -110,11 +110,11 @@  discard block
 block discarded – undo
110 110
 
111 111
                 if (!is_file($src)) {
112 112
                     $fs = new Filesystem();
113
-                    if (!$fs->exists($uploadDir . $media->getFolder())) {
114
-                        $fs->mkdir($uploadDir . $media->getFolder());
113
+                    if (!$fs->exists($uploadDir.$media->getFolder())) {
114
+                        $fs->mkdir($uploadDir.$media->getFolder());
115 115
                     }
116 116
 
117
-                    $path = 'upload/' . $media->getUri();
117
+                    $path = 'upload/'.$media->getUri();
118 118
 
119 119
                     // find the image and determine its type
120 120
                     $image = $dataManager->find($filter, $path);
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
                     // run the filter
123 123
                     $responseData = $filterManager->applyFilter($image, $filter);
124 124
                     $data = $responseData->getContent();
125
-                    file_put_contents($uploadDir . $media->getUri(), $data);
125
+                    file_put_contents($uploadDir.$media->getUri(), $data);
126 126
                 } else {
127 127
                     $data = file_get_contents($src);
128 128
                     $lastModified->setTimestamp(filemtime($src));
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
         } else {
136 136
             $lastModified->setTimestamp(filemtime($src));
137 137
             $data = file_get_contents($src);
138
-            $response->headers->set('Content-disposition', 'attachment;filename=' . basename($media->getUri()));
138
+            $response->headers->set('Content-disposition', 'attachment;filename='.basename($media->getUri()));
139 139
         }
140 140
 
141 141
         $response->setLastModified($lastModified);
Please login to merge, or discard this patch.