View GitHub Repository bulletproof

Schedule Inspection
Subscribe
Completed
Branch — prettify (695764)
by samayo
01:20
created
Status
Category
Toggle Patches
src/bulletproof.php 3 patches
Indentation   +440 added lines, -440 removed lines patch added patch discarded remove patch 
@@ -16,446 +16,446 @@
 
 block discarded – undo
16 16
17 17 
 class Image implements \ArrayAccess
18 18 
 {
19 
-    /**
20 
-     * @var string The new image name, to be provided or will be generated.
21 
-     */
22 
-    protected $name;
23 
-
24 
-    /**
25 
-     * @var int The image width in pixels
26 
-     */
27 
-    protected $width;
28 
-
29 
-    /**
30 
-     * @var int The image height in pixels
31 
-     */
32 
-    protected $height;
33 
-
34 
-    /**
35 
-     * @var string The image mime type (extension)
36 
-     */
37 
-    protected $mime;
38 
-
39 
-    /**
40 
-     * @var string The full image path (dir + image + mime)
41 
-     */
42 
-    protected $fullPath;
43 
-
44 
-    /**
45 
-     * @var string The folder or image storage location
46 
-     */
47 
-    protected $location;
48 
-
49 
-    /**
50 
-     * @var array The min and max image size allowed for upload (in bytes)
51 
-     */
52 
-    protected $size = array(100, 500000);
53 
-
54 
-    /**
55 
-     * @var array The max height and width image allowed
56 
-     */
57 
-    protected $dimensions = array(5000, 5000);
58 
-
59 
-    /**
60 
-     * @var array The mime types allowed for upload
61 
-     */
62 
-    protected $mimeTypes = array('jpeg', 'png', 'gif', 'jpg');
63 
-
64 
-    /**
65 
-     * @var array list of known image types
66 
-     */
67 
-    protected $acceptedMimes = array(
68 
-        1 => 'gif', 'jpeg', 'png', 'swf', 'psd',
69 
-        'bmp', 'tiff', 'tiff', 'jpc', 'jp2', 'jpx',
70 
-        'jb2', 'swc', 'iff', 'wbmp', 'xbm', 'ico'
71 
-    );
72 
-    /**
73 
-     * @var array error messages strings
74 
-     */
75 
-    protected $commonUploadErrors = array(
76 
-        UPLOAD_ERR_OK         => '',
77 
-        UPLOAD_ERR_INI_SIZE   => 'Image is larger than the specified amount set by the server',
78 
-        UPLOAD_ERR_FORM_SIZE  => 'Image is larger than the specified amount specified by browser',
79 
-        UPLOAD_ERR_PARTIAL    => 'Image could not be fully uploaded. Please try again later',
80 
-        UPLOAD_ERR_NO_FILE    => 'Image is not found',
81 
-        UPLOAD_ERR_NO_TMP_DIR => 'Can\'t write to disk, due to server configuration ( No tmp dir found )',
82 
-        UPLOAD_ERR_CANT_WRITE => 'Failed to write file to disk. Please check you file permissions',
83 
-        UPLOAD_ERR_EXTENSION  => 'A PHP extension has halted this file upload process'
84 
-    );
85 
-    /**
86 
-     * @var array storage for the $_FILES global array
87 
-     */
88 
-    private $_files = array();
89 
-    /**
90 
-     * @var string storage for any errors
91 
-     */
92 
-    private $error = '';
93 
-
94 
-    /**
95 
-     * @param array $_files represents the $_FILES array passed as dependency
96 
-     */
97 
-    public function __construct(array $_files = array())
98 
-    {
99 
-        /* check if php_exif is enabled */
100 
-        if (!function_exists('exif_imagetype')) {
101 
-            $this->error = 'Function \'exif_imagetype\' Not found. Please enable \'php_exif\' in your PHP.ini';
102 
-            return null;
103 
-        }
104 
-
105 
-        $this->_files = $_files;
106 
-    }
107 
-
108 
-    /**
109 
-     * @param mixed $offset
110 
-     * @param mixed $value
111 
-     * @return null
112 
-     */
113 
-    public function offsetSet($offset, $value){}
114 
-
115 
-    /**
116 
-     * @param mixed $offset
117 
-     * @return null
118 
-     */
119 
-    public function offsetExists($offset){}
120 
-
121 
-    /**
122 
-     * @param mixed $offset
123 
-     * @return null
124 
-     */
125 
-    public function offsetUnset($offset){}
126 
-
127 
-    /**
128 
-     * Gets array value \ArrayAccess
129 
-     *
130 
-     * @param mixed $offset
131 
-     *
132 
-     * @return string|boolean
133 
-     */
134 
-    public function offsetGet($offset)
135 
-    {
136 
-        // return error if requested
137 
-        if ($offset == 'error') {
138 
-            return $this->error;
139 
-        }
19 
+	/**
20 
+	 * @var string The new image name, to be provided or will be generated.
21 
+	 */
22 
+	protected $name;
23 
+
24 
+	/**
25 
+	 * @var int The image width in pixels
26 
+	 */
27 
+	protected $width;
28 
+
29 
+	/**
30 
+	 * @var int The image height in pixels
31 
+	 */
32 
+	protected $height;
33 
+
34 
+	/**
35 
+	 * @var string The image mime type (extension)
36 
+	 */
37 
+	protected $mime;
38 
+
39 
+	/**
40 
+	 * @var string The full image path (dir + image + mime)
41 
+	 */
42 
+	protected $fullPath;
43 
+
44 
+	/**
45 
+	 * @var string The folder or image storage location
46 
+	 */
47 
+	protected $location;
48 
+
49 
+	/**
50 
+	 * @var array The min and max image size allowed for upload (in bytes)
51 
+	 */
52 
+	protected $size = array(100, 500000);
53 
+
54 
+	/**
55 
+	 * @var array The max height and width image allowed
56 
+	 */
57 
+	protected $dimensions = array(5000, 5000);
58 
+
59 
+	/**
60 
+	 * @var array The mime types allowed for upload
61 
+	 */
62 
+	protected $mimeTypes = array('jpeg', 'png', 'gif', 'jpg');
63 
+
64 
+	/**
65 
+	 * @var array list of known image types
66 
+	 */
67 
+	protected $acceptedMimes = array(
68 
+		1 => 'gif', 'jpeg', 'png', 'swf', 'psd',
69 
+		'bmp', 'tiff', 'tiff', 'jpc', 'jp2', 'jpx',
70 
+		'jb2', 'swc', 'iff', 'wbmp', 'xbm', 'ico'
71 
+	);
72 
+	/**
73 
+	 * @var array error messages strings
74 
+	 */
75 
+	protected $commonUploadErrors = array(
76 
+		UPLOAD_ERR_OK         => '',
77 
+		UPLOAD_ERR_INI_SIZE   => 'Image is larger than the specified amount set by the server',
78 
+		UPLOAD_ERR_FORM_SIZE  => 'Image is larger than the specified amount specified by browser',
79 
+		UPLOAD_ERR_PARTIAL    => 'Image could not be fully uploaded. Please try again later',
80 
+		UPLOAD_ERR_NO_FILE    => 'Image is not found',
81 
+		UPLOAD_ERR_NO_TMP_DIR => 'Can\'t write to disk, due to server configuration ( No tmp dir found )',
82 
+		UPLOAD_ERR_CANT_WRITE => 'Failed to write file to disk. Please check you file permissions',
83 
+		UPLOAD_ERR_EXTENSION  => 'A PHP extension has halted this file upload process'
84 
+	);
85 
+	/**
86 
+	 * @var array storage for the $_FILES global array
87 
+	 */
88 
+	private $_files = array();
89 
+	/**
90 
+	 * @var string storage for any errors
91 
+	 */
92 
+	private $error = '';
93 
+
94 
+	/**
95 
+	 * @param array $_files represents the $_FILES array passed as dependency
96 
+	 */
97 
+	public function __construct(array $_files = array())
98 
+	{
99 
+		/* check if php_exif is enabled */
100 
+		if (!function_exists('exif_imagetype')) {
101 
+			$this->error = 'Function \'exif_imagetype\' Not found. Please enable \'php_exif\' in your PHP.ini';
102 
+			return null;
103 
+		}
104 
+
105 
+		$this->_files = $_files;
106 
+	}
107 
+
108 
+	/**
109 
+	 * @param mixed $offset
110 
+	 * @param mixed $value
111 
+	 * @return null
112 
+	 */
113 
+	public function offsetSet($offset, $value){}
114 
+
115 
+	/**
116 
+	 * @param mixed $offset
117 
+	 * @return null
118 
+	 */
119 
+	public function offsetExists($offset){}
120 
+
121 
+	/**
122 
+	 * @param mixed $offset
123 
+	 * @return null
124 
+	 */
125 
+	public function offsetUnset($offset){}
126 
+
127 
+	/**
128 
+	 * Gets array value \ArrayAccess
129 
+	 *
130 
+	 * @param mixed $offset
131 
+	 *
132 
+	 * @return string|boolean
133 
+	 */
134 
+	public function offsetGet($offset)
135 
+	{
136 
+		// return error if requested
137 
+		if ($offset == 'error') {
138 
+			return $this->error;
139 
+		}
140 140
141 
-        // return false if $image['key'] isn't found
142 
-        if (!isset($this->_files[$offset])) {
143 
-            return false;
144 
-        }
145 
-
146 
-        $this->_files = $this->_files[$offset];
147 
-
148 
-        // check for common upload errors
149 
-
150 
-        if(isset($this->_files['error'])){
151 
-            $this->error = $this->commonUploadErrors[$this->_files['error']];
152 
-        }
153 
-
154 
-        return true;
155 
-    }
156 
-
157 
-    /**
158 
-     * Sets max image height and width limit
159 
-     *
160 
-     * @param $maxWidth int max width value
161 
-     * @param $maxHeight int max height value
162 
-     *
163 
-     * @return $this
164 
-     */
165 
-    public function setDimension($maxWidth, $maxHeight)
166 
-    {
167 
-        $this->dimensions = array($maxWidth, $maxHeight);
168 
-        return $this;
169 
-    }
170 
-
171 
-    /**
172 
-     * Returns the full path of the image ex 'location/image.mime'
173 
-     *
174 
-     * @return string
175 
-     */
176 
-    public function getFullPath()
177 
-    {
178 
-        $this->fullPath = $this->location . '/' . $this->name . '.' . $this->mime;
179 
-        return $this->fullPath;
180 
-    }
181 
-
182 
-    /**
183 
-     * Returns the image size in bytes
184 
-     *
185 
-     * @return int
186 
-     */
187 
-    public function getSize()
188 
-    {
189 
-        return (int) $this->_files['size'];
190 
-    }
191 
-
192 
-    /**
193 
-     * Define a min and max image size for uploading
194 
-     *
195 
-     * @param $min int minimum value in bytes
196 
-     * @param $max int maximum value in bytes
197 
-     *
198 
-     * @return $this
199 
-     */
200 
-    public function setSize($min, $max)
201 
-    {
202 
-        $this->size = array($min, $max);
203 
-        return $this;
204 
-    }
205 
-
206 
-    /**
207 
-     * Returns a JSON format of the image width, height, name, mime ...
208 
-     *
209 
-     * @return string
210 
-     */
211 
-    public function getJson()
212 
-    {
213 
-        /* gather image info for json storage */
214 
-        return json_encode (
215 
-            array(
216 
-                'name'      => $this->name,
217 
-                'mime'      => $this->mime,
218 
-                'height'    => $this->height,
219 
-                'width'     => $this->width,
220 
-                'size'      => $this->_files['size'],
221 
-                'location'  => $this->location,
222 
-                'fullpath'  => $this->fullPath
223 
-            )
224 
-        );
225 
-    }
226 
-
227 
-    /**
228 
-     * Returns the image mime type
229 
-     *
230 
-     * @return null|string
231 
-     */
232 
-    public function getMime()
233 
-    {
234 
-        if (!$this->mime) {
235 
-            return $this->getImageMime($this->_files['tmp_name']);
236 
-        }
237 
-        return $this->mime;
238 
-    }
239 
-
240 
-    /**
241 
-     * Define a mime type for uploading
242 
-     *
243 
-     * @param array $fileTypes
244 
-     *
245 
-     * @return $this
246 
-     */
247 
-    public function setMime(array $fileTypes)
248 
-    {
249 
-        $this->mimeTypes = $fileTypes;
250 
-        return $this;
251 
-    }
252 
-
253 
-    /**
254 
-     * Gets the real image mime type
255 
-     *
256 
-     * @param $tmp_name string The upload tmp directory
257 
-     *
258 
-     * @return null|string
259 
-     */
260 
-    protected function getImageMime($tmp_name)
261 
-    {
262 
-        $mime = @ $this->acceptedMimes[exif_imagetype($tmp_name)];
263 
-
264 
-        if (!$mime) {
265 
-            return null;
266 
-        }
267 
-
268 
-        return $mime;
269 
-    }
270 
-
271 
-    /**
272 
-     * Returns error string or false if no errors occurred
273 
-     *
274 
-     * @return string|false
275 
-     */
276 
-    public function getError()
277 
-    {
278 
-        return $this->error != '' ? $this->error : false;
279 
-    }
280 
-
281 
-    /**
282 
-     * Returns the image name
283 
-     *
284 
-     * @return string
285 
-     */
286 
-    public function getName()
287 
-    {
288 
-        if (!$this->name) {
289 
-            return uniqid('', true) . '_' . str_shuffle(implode(range('e', 'q')));
290 
-        }
291 
-
292 
-        return $this->name;
293 
-    }
294 
-
295 
-    /**
296 
-     * Provide image name if not provided
297 
-     *
298 
-     * @param null $isNameProvided
299 
-     * @return $this
300 
-     */
301 
-    public function setName($isNameProvided = null)
302 
-    {
303 
-        if ($isNameProvided) {
304 
-            $this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING);
305 
-        }
306 
-
307 
-        return $this;
308 
-    }
309 
-
310 
-    /**
311 
-     * Returns the image width
312 
-     *
313 
-     * @return int
314 
-     */
315 
-    public function getWidth()
316 
-    {
317 
-        if ($this->width != null) {
318 
-            return $this->width;
319 
-        }
320 
-
321 
-        list($width) = getImageSize($this->_files['tmp_name']);
322 
-        return $width;
323 
-    }
324 
-
325 
-    /**
326 
-     * Returns the image height in pixels
327 
-     *
328 
-     * @return int
329 
-     */
330 
-    public function getHeight()
331 
-    {
332 
-        if ($this->height != null) {
333 
-            return $this->height;
334 
-        }
335 
-
336 
-        list(, $height) = getImageSize($this->_files['tmp_name']);
337 
-        return $height;
338 
-    }
339 
-
340 
-    /**
341 
-     * Returns the storage / folder name
342 
-     *
343 
-     * @return string
344 
-     */
345 
-    public function getLocation()
346 
-    {
347 
-        if (!$this->location) {
348 
-            $this->setLocation();
349 
-        }
350 
-
351 
-        return $this->location;
352 
-    }
353 
-
354 
-    /**
355 
-     * Creates a location for upload storage
356 
-     *
357 
-     * @param $dir string the folder name to create
358 
-     * @param int $permission chmod permission
359 
-     *
360 
-     * @return $this
361 
-     */
362 
-    public function setLocation($dir = 'bulletproof', $permission = 0666)
363 
-    {
364 
-        if (!file_exists($dir) && !is_dir($dir) && !$this->location) {
365 
-            $createFolder = @mkdir('' . $dir, (int) $permission, true);
366 
-            if (!$createFolder) {
367 
-                $this->error = 'Error! Folder ' . $dir . ' could not be created';
368 
-                return false;
369 
-            }
370 
-        }
371 
-
372 
-        /* check if we can create a file in the directory */
373 
-        if (!is_writable($dir)) {
374 
-            $this->error = 'The images directory \'' . $dir . '\' is not writable!';
375 
-            return false;
376 
-        }
377 
-
378 
-        $this->location = $dir;
379 
-        return $this;
380 
-    }
381 
-
382 
-    /**
383 
-     * This methods validates and uploads the image
384 
-     * @return false|null|Image
385 
-     */
386 
-    public function upload()
387 
-    {
388 
-        /* modify variable names for convenience */
389 
-        $image = $this;
390 
-        $files = $this->_files;
391 
-
392 
-        if ($this->error || !isset($files['tmp_name'])) {
393 
-            return false;
394 
-        }
395 
-
396 
-        /* check image for valid mime types and return mime */
397 
-        $image->mime = $image->getImageMime($files['tmp_name']);
398 
-        /* validate image mime type */
399 
-        if (!in_array($image->mime, $image->mimeTypes)) {
400 
-            $ext = implode(', ', $image->mimeTypes);
401 
-            $image->error = sprintf('Invalid File! Only (%s) image types are allowed', $ext);
402 
-            return false;
403 
-        }
404 
-
405 
-        /* initialize image properties */
406 
-        $image->name = $image->getName();
407 
-        $image->width = $image->getWidth();
408 
-        $image->height = $image->getHeight();
409 
-        $image->location = $image->getLocation();
141 
+		// return false if $image['key'] isn't found
142 
+		if (!isset($this->_files[$offset])) {
143 
+			return false;
144 
+		}
145 
+
146 
+		$this->_files = $this->_files[$offset];
147 
+
148 
+		// check for common upload errors
149 
+
150 
+		if(isset($this->_files['error'])){
151 
+			$this->error = $this->commonUploadErrors[$this->_files['error']];
152 
+		}
153 
+
154 
+		return true;
155 
+	}
156 
+
157 
+	/**
158 
+	 * Sets max image height and width limit
159 
+	 *
160 
+	 * @param $maxWidth int max width value
161 
+	 * @param $maxHeight int max height value
162 
+	 *
163 
+	 * @return $this
164 
+	 */
165 
+	public function setDimension($maxWidth, $maxHeight)
166 
+	{
167 
+		$this->dimensions = array($maxWidth, $maxHeight);
168 
+		return $this;
169 
+	}
170 
+
171 
+	/**
172 
+	 * Returns the full path of the image ex 'location/image.mime'
173 
+	 *
174 
+	 * @return string
175 
+	 */
176 
+	public function getFullPath()
177 
+	{
178 
+		$this->fullPath = $this->location . '/' . $this->name . '.' . $this->mime;
179 
+		return $this->fullPath;
180 
+	}
181 
+
182 
+	/**
183 
+	 * Returns the image size in bytes
184 
+	 *
185 
+	 * @return int
186 
+	 */
187 
+	public function getSize()
188 
+	{
189 
+		return (int) $this->_files['size'];
190 
+	}
191 
+
192 
+	/**
193 
+	 * Define a min and max image size for uploading
194 
+	 *
195 
+	 * @param $min int minimum value in bytes
196 
+	 * @param $max int maximum value in bytes
197 
+	 *
198 
+	 * @return $this
199 
+	 */
200 
+	public function setSize($min, $max)
201 
+	{
202 
+		$this->size = array($min, $max);
203 
+		return $this;
204 
+	}
205 
+
206 
+	/**
207 
+	 * Returns a JSON format of the image width, height, name, mime ...
208 
+	 *
209 
+	 * @return string
210 
+	 */
211 
+	public function getJson()
212 
+	{
213 
+		/* gather image info for json storage */
214 
+		return json_encode (
215 
+			array(
216 
+				'name'      => $this->name,
217 
+				'mime'      => $this->mime,
218 
+				'height'    => $this->height,
219 
+				'width'     => $this->width,
220 
+				'size'      => $this->_files['size'],
221 
+				'location'  => $this->location,
222 
+				'fullpath'  => $this->fullPath
223 
+			)
224 
+		);
225 
+	}
226 
+
227 
+	/**
228 
+	 * Returns the image mime type
229 
+	 *
230 
+	 * @return null|string
231 
+	 */
232 
+	public function getMime()
233 
+	{
234 
+		if (!$this->mime) {
235 
+			return $this->getImageMime($this->_files['tmp_name']);
236 
+		}
237 
+		return $this->mime;
238 
+	}
239 
+
240 
+	/**
241 
+	 * Define a mime type for uploading
242 
+	 *
243 
+	 * @param array $fileTypes
244 
+	 *
245 
+	 * @return $this
246 
+	 */
247 
+	public function setMime(array $fileTypes)
248 
+	{
249 
+		$this->mimeTypes = $fileTypes;
250 
+		return $this;
251 
+	}
252 
+
253 
+	/**
254 
+	 * Gets the real image mime type
255 
+	 *
256 
+	 * @param $tmp_name string The upload tmp directory
257 
+	 *
258 
+	 * @return null|string
259 
+	 */
260 
+	protected function getImageMime($tmp_name)
261 
+	{
262 
+		$mime = @ $this->acceptedMimes[exif_imagetype($tmp_name)];
263 
+
264 
+		if (!$mime) {
265 
+			return null;
266 
+		}
267 
+
268 
+		return $mime;
269 
+	}
270 
+
271 
+	/**
272 
+	 * Returns error string or false if no errors occurred
273 
+	 *
274 
+	 * @return string|false
275 
+	 */
276 
+	public function getError()
277 
+	{
278 
+		return $this->error != '' ? $this->error : false;
279 
+	}
280 
+
281 
+	/**
282 
+	 * Returns the image name
283 
+	 *
284 
+	 * @return string
285 
+	 */
286 
+	public function getName()
287 
+	{
288 
+		if (!$this->name) {
289 
+			return uniqid('', true) . '_' . str_shuffle(implode(range('e', 'q')));
290 
+		}
291 
+
292 
+		return $this->name;
293 
+	}
294 
+
295 
+	/**
296 
+	 * Provide image name if not provided
297 
+	 *
298 
+	 * @param null $isNameProvided
299 
+	 * @return $this
300 
+	 */
301 
+	public function setName($isNameProvided = null)
302 
+	{
303 
+		if ($isNameProvided) {
304 
+			$this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING);
305 
+		}
306 
+
307 
+		return $this;
308 
+	}
309 
+
310 
+	/**
311 
+	 * Returns the image width
312 
+	 *
313 
+	 * @return int
314 
+	 */
315 
+	public function getWidth()
316 
+	{
317 
+		if ($this->width != null) {
318 
+			return $this->width;
319 
+		}
320 
+
321 
+		list($width) = getImageSize($this->_files['tmp_name']);
322 
+		return $width;
323 
+	}
324 
+
325 
+	/**
326 
+	 * Returns the image height in pixels
327 
+	 *
328 
+	 * @return int
329 
+	 */
330 
+	public function getHeight()
331 
+	{
332 
+		if ($this->height != null) {
333 
+			return $this->height;
334 
+		}
335 
+
336 
+		list(, $height) = getImageSize($this->_files['tmp_name']);
337 
+		return $height;
338 
+	}
339 
+
340 
+	/**
341 
+	 * Returns the storage / folder name
342 
+	 *
343 
+	 * @return string
344 
+	 */
345 
+	public function getLocation()
346 
+	{
347 
+		if (!$this->location) {
348 
+			$this->setLocation();
349 
+		}
350 
+
351 
+		return $this->location;
352 
+	}
353 
+
354 
+	/**
355 
+	 * Creates a location for upload storage
356 
+	 *
357 
+	 * @param $dir string the folder name to create
358 
+	 * @param int $permission chmod permission
359 
+	 *
360 
+	 * @return $this
361 
+	 */
362 
+	public function setLocation($dir = 'bulletproof', $permission = 0666)
363 
+	{
364 
+		if (!file_exists($dir) && !is_dir($dir) && !$this->location) {
365 
+			$createFolder = @mkdir('' . $dir, (int) $permission, true);
366 
+			if (!$createFolder) {
367 
+				$this->error = 'Error! Folder ' . $dir . ' could not be created';
368 
+				return false;
369 
+			}
370 
+		}
371 
+
372 
+		/* check if we can create a file in the directory */
373 
+		if (!is_writable($dir)) {
374 
+			$this->error = 'The images directory \'' . $dir . '\' is not writable!';
375 
+			return false;
376 
+		}
377 
+
378 
+		$this->location = $dir;
379 
+		return $this;
380 
+	}
381 
+
382 
+	/**
383 
+	 * This methods validates and uploads the image
384 
+	 * @return false|null|Image
385 
+	 */
386 
+	public function upload()
387 
+	{
388 
+		/* modify variable names for convenience */
389 
+		$image = $this;
390 
+		$files = $this->_files;
391 
+
392 
+		if ($this->error || !isset($files['tmp_name'])) {
393 
+			return false;
394 
+		}
395 
+
396 
+		/* check image for valid mime types and return mime */
397 
+		$image->mime = $image->getImageMime($files['tmp_name']);
398 
+		/* validate image mime type */
399 
+		if (!in_array($image->mime, $image->mimeTypes)) {
400 
+			$ext = implode(', ', $image->mimeTypes);
401 
+			$image->error = sprintf('Invalid File! Only (%s) image types are allowed', $ext);
402 
+			return false;
403 
+		}
404 
+
405 
+		/* initialize image properties */
406 
+		$image->name = $image->getName();
407 
+		$image->width = $image->getWidth();
408 
+		$image->height = $image->getHeight();
409 
+		$image->location = $image->getLocation();
410 410
411 
-        $image->getFullPath();
412 
-
413 
-        /* get image sizes */
414 
-        list($minSize, $maxSize) = $image->size;
415 
-
416 
-        /* check image size based on the settings */
417 
-        if ($files['size'] < $minSize || $files['size'] > $maxSize) {
418 
-            $min = intval($minSize / 1000) ?: 1;
419 
-            $max = intval($maxSize / 1000) ?: 1;
420 
-            $image->error = 'Image size should be at least ' . $min . ' KB, and no more than ' . $max . ' KB';
421 
-            return false;
422 
-        }
423 
-
424 
-        /* check image dimension */
425 
-        list($allowedWidth, $allowedHeight) = $image->dimensions;
426 
-
427 
-        if ($image->height > $allowedHeight || $image->width > $allowedWidth) {
428 
-            $image->error = 'Image height/width should be less than ' . $allowedHeight . '/' . $allowedWidth . ' pixels';
429 
-            return false;
430 
-        }
431 
-
432 
-        if ($image->height < 2 || $image->width < 2) {
433 
-            $image->error = 'Image height/width too small or corrupted.';
434 
-            return false;
435 
-        }
436 
-
437 
-        if ($image->error === '') {
438 
-            $moveUpload = $image->moveUploadedFile($files['tmp_name'], $image->fullPath);
439 
-            if (false !== $moveUpload) {
440 
-                return $image;
441 
-            }
442 
-        }
443 
-
444 
-        $image->error = 'Upload failed, Unknown error occured';
445 
-        return false;
446 
-    }
447 
-
448 
-
449 
-    /**
450 
-     * Final upload method to be called, isolated for testing purposes
451 
-     *
452 
-     * @param $tmp_name int the temporary location of the image file
453 
-     * @param $destination int upload destination
454 
-     *
455 
-     * @return bool
456 
-     */
457 
-    public function moveUploadedFile($tmp_name, $destination)
458 
-    {
459 
-        return move_uploaded_file($tmp_name, $destination);
460 
-    }
411 
+		$image->getFullPath();
412 
+
413 
+		/* get image sizes */
414 
+		list($minSize, $maxSize) = $image->size;
415 
+
416 
+		/* check image size based on the settings */
417 
+		if ($files['size'] < $minSize || $files['size'] > $maxSize) {
418 
+			$min = intval($minSize / 1000) ?: 1;
419 
+			$max = intval($maxSize / 1000) ?: 1;
420 
+			$image->error = 'Image size should be at least ' . $min . ' KB, and no more than ' . $max . ' KB';
421 
+			return false;
422 
+		}
423 
+
424 
+		/* check image dimension */
425 
+		list($allowedWidth, $allowedHeight) = $image->dimensions;
426 
+
427 
+		if ($image->height > $allowedHeight || $image->width > $allowedWidth) {
428 
+			$image->error = 'Image height/width should be less than ' . $allowedHeight . '/' . $allowedWidth . ' pixels';
429 
+			return false;
430 
+		}
431 
+
432 
+		if ($image->height < 2 || $image->width < 2) {
433 
+			$image->error = 'Image height/width too small or corrupted.';
434 
+			return false;
435 
+		}
436 
+
437 
+		if ($image->error === '') {
438 
+			$moveUpload = $image->moveUploadedFile($files['tmp_name'], $image->fullPath);
439 
+			if (false !== $moveUpload) {
440 
+				return $image;
441 
+			}
442 
+		}
443 
+
444 
+		$image->error = 'Upload failed, Unknown error occured';
445 
+		return false;
446 
+	}
447 
+
448 
+
449 
+	/**
450 
+	 * Final upload method to be called, isolated for testing purposes
451 
+	 *
452 
+	 * @param $tmp_name int the temporary location of the image file
453 
+	 * @param $destination int upload destination
454 
+	 *
455 
+	 * @return bool
456 
+	 */
457 
+	public function moveUploadedFile($tmp_name, $destination)
458 
+	{
459 
+		return move_uploaded_file($tmp_name, $destination);
460 
+	}
461 461 
 }
462 462 
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch 
@@ -110,19 +110,19 @@  discard block
 
 block discarded – undo
110 110 
      * @param mixed $value
111 111 
      * @return null
112 112 
      */
113 
-    public function offsetSet($offset, $value){}
113 
+    public function offsetSet($offset, $value) {}
114 114
115 115 
     /**
116 116 
      * @param mixed $offset
117 117 
      * @return null
118 118 
      */
119 
-    public function offsetExists($offset){}
119 
+    public function offsetExists($offset) {}
120 120
121 121 
     /**
122 122 
      * @param mixed $offset
123 123 
      * @return null
124 124 
      */
125 
-    public function offsetUnset($offset){}
125 
+    public function offsetUnset($offset) {}
126 126
127 127 
     /**
128 128 
      * Gets array value \ArrayAccess

@@ -147,7 +147,7 @@  discard block
 
 block discarded – undo
147 147
148 148 
         // check for common upload errors
149 149
150 
-        if(isset($this->_files['error'])){
150 
+        if (isset($this->_files['error'])) {
151 151 
             $this->error = $this->commonUploadErrors[$this->_files['error']];
152 152 
         }
153 153 
 

@@ -175,7 +175,7 @@  discard block
 
 block discarded – undo
175 175 
      */
176 176 
     public function getFullPath()
177 177 
     {
178 
-        $this->fullPath = $this->location . '/' . $this->name . '.' . $this->mime;
178 
+        $this->fullPath = $this->location.'/'.$this->name.'.'.$this->mime;
179 179 
         return $this->fullPath;
180 180 
     }
181 181 
 

@@ -211,7 +211,7 @@  discard block
 
 block discarded – undo
211 211 
     public function getJson()
212 212 
     {
213 213 
         /* gather image info for json storage */
214 
-        return json_encode (
214 
+        return json_encode(
215 215 
             array(
216 216 
                 'name'      => $this->name,
217 217 
                 'mime'      => $this->mime,

@@ -286,7 +286,7 @@  discard block
 
 block discarded – undo
286 286 
     public function getName()
287 287 
     {
288 288 
         if (!$this->name) {
289 
-            return uniqid('', true) . '_' . str_shuffle(implode(range('e', 'q')));
289 
+            return uniqid('', true).'_'.str_shuffle(implode(range('e', 'q')));
290 290 
         }
291 291
292 292 
         return $this->name;

@@ -362,16 +362,16 @@  discard block
 
 block discarded – undo
362 362 
     public function setLocation($dir = 'bulletproof', $permission = 0666)
363 363 
     {
364 364 
         if (!file_exists($dir) && !is_dir($dir) && !$this->location) {
365 
-            $createFolder = @mkdir('' . $dir, (int) $permission, true);
365 
+            $createFolder = @mkdir(''.$dir, (int) $permission, true);
366 366 
             if (!$createFolder) {
367 
-                $this->error = 'Error! Folder ' . $dir . ' could not be created';
367 
+                $this->error = 'Error! Folder '.$dir.' could not be created';
368 368 
                 return false;
369 369 
             }
370 370 
         }
371 371
372 372 
         /* check if we can create a file in the directory */
373 373 
         if (!is_writable($dir)) {
374 
-            $this->error = 'The images directory \'' . $dir . '\' is not writable!';
374 
+            $this->error = 'The images directory \''.$dir.'\' is not writable!';
375 375 
             return false;
376 376 
         }
377 377 
 

@@ -417,7 +417,7 @@  discard block
 
 block discarded – undo
417 417 
         if ($files['size'] < $minSize || $files['size'] > $maxSize) {
418 418 
             $min = intval($minSize / 1000) ?: 1;
419 419 
             $max = intval($maxSize / 1000) ?: 1;
420 
-            $image->error = 'Image size should be at least ' . $min . ' KB, and no more than ' . $max . ' KB';
420 
+            $image->error = 'Image size should be at least '.$min.' KB, and no more than '.$max.' KB';
421 421 
             return false;
422 422 
         }
423 423 
 

@@ -425,7 +425,7 @@  discard block
 
 block discarded – undo
425 425 
         list($allowedWidth, $allowedHeight) = $image->dimensions;
426 426
427 427 
         if ($image->height > $allowedHeight || $image->width > $allowedWidth) {
428 
-            $image->error = 'Image height/width should be less than ' . $allowedHeight . '/' . $allowedWidth . ' pixels';
428 
+            $image->error = 'Image height/width should be less than '.$allowedHeight.'/'.$allowedWidth.' pixels';
429 429 
             return false;
430 430 
         }
431 431
Please login to merge, or discard this patch.
Braces   +19 added lines, -38 removed lines patch added patch discarded remove patch 
@@ -94,8 +94,7 @@  discard block
 
 block discarded – undo
94 94 
     /**
95 95 
      * @param array $_files represents the $_FILES array passed as dependency
96 96 
      */
97 
-    public function __construct(array $_files = array())
98 
-    {
97 
+    public function __construct(array $_files = array()) {
99 98 
         /* check if php_exif is enabled */
100 99 
         if (!function_exists('exif_imagetype')) {
101 100 
             $this->error = 'Function \'exif_imagetype\' Not found. Please enable \'php_exif\' in your PHP.ini';

@@ -131,8 +130,7 @@  discard block
 
 block discarded – undo
131 130 
      *
132 131 
      * @return string|boolean
133 132 
      */
134 
-    public function offsetGet($offset)
135 
-    {
133 
+    public function offsetGet($offset) {
136 134 
         // return error if requested
137 135 
         if ($offset == 'error') {
138 136 
             return $this->error;

@@ -162,8 +160,7 @@  discard block
 
 block discarded – undo
162 160 
      *
163 161 
      * @return $this
164 162 
      */
165 
-    public function setDimension($maxWidth, $maxHeight)
166 
-    {
163 
+    public function setDimension($maxWidth, $maxHeight) {
167 164 
         $this->dimensions = array($maxWidth, $maxHeight);
168 165 
         return $this;
169 166 
     }

@@ -173,8 +170,7 @@  discard block
 
 block discarded – undo
173 170 
      *
174 171 
      * @return string
175 172 
      */
176 
-    public function getFullPath()
177 
-    {
173 
+    public function getFullPath() {
178 174 
         $this->fullPath = $this->location . '/' . $this->name . '.' . $this->mime;
179 175 
         return $this->fullPath;
180 176 
     }

@@ -184,8 +180,7 @@  discard block
 
 block discarded – undo
184 180 
      *
185 181 
      * @return int
186 182 
      */
187 
-    public function getSize()
188 
-    {
183 
+    public function getSize() {
189 184 
         return (int) $this->_files['size'];
190 185 
     }
191 186 
 

@@ -197,8 +192,7 @@  discard block
 
 block discarded – undo
197 192 
      *
198 193 
      * @return $this
199 194 
      */
200 
-    public function setSize($min, $max)
201 
-    {
195 
+    public function setSize($min, $max) {
202 196 
         $this->size = array($min, $max);
203 197 
         return $this;
204 198 
     }

@@ -208,8 +202,7 @@  discard block
 
 block discarded – undo
208 202 
      *
209 203 
      * @return string
210 204 
      */
211 
-    public function getJson()
212 
-    {
205 
+    public function getJson() {
213 206 
         /* gather image info for json storage */
214 207 
         return json_encode (
215 208 
             array(

@@ -229,8 +222,7 @@  discard block
 
 block discarded – undo
229 222 
      *
230 223 
      * @return null|string
231 224 
      */
232 
-    public function getMime()
233 
-    {
225 
+    public function getMime() {
234 226 
         if (!$this->mime) {
235 227 
             return $this->getImageMime($this->_files['tmp_name']);
236 228 
         }

@@ -244,8 +236,7 @@  discard block
 
 block discarded – undo
244 236 
      *
245 237 
      * @return $this
246 238 
      */
247 
-    public function setMime(array $fileTypes)
248 
-    {
239 
+    public function setMime(array $fileTypes) {
249 240 
         $this->mimeTypes = $fileTypes;
250 241 
         return $this;
251 242 
     }

@@ -257,8 +248,7 @@  discard block
 
 block discarded – undo
257 248 
      *
258 249 
      * @return null|string
259 250 
      */
260 
-    protected function getImageMime($tmp_name)
261 
-    {
251 
+    protected function getImageMime($tmp_name) {
262 252 
         $mime = @ $this->acceptedMimes[exif_imagetype($tmp_name)];
263 253
264 254 
         if (!$mime) {

@@ -273,8 +263,7 @@  discard block
 
 block discarded – undo
273 263 
      *
274 264 
      * @return string|false
275 265 
      */
276 
-    public function getError()
277 
-    {
266 
+    public function getError() {
278 267 
         return $this->error != '' ? $this->error : false;
279 268 
     }
280 269 
 

@@ -283,8 +272,7 @@  discard block
 
 block discarded – undo
283 272 
      *
284 273 
      * @return string
285 274 
      */
286 
-    public function getName()
287 
-    {
275 
+    public function getName() {
288 276 
         if (!$this->name) {
289 277 
             return uniqid('', true) . '_' . str_shuffle(implode(range('e', 'q')));
290 278 
         }

@@ -298,8 +286,7 @@  discard block
 
 block discarded – undo
298 286 
      * @param null $isNameProvided
299 287 
      * @return $this
300 288 
      */
301 
-    public function setName($isNameProvided = null)
302 
-    {
289 
+    public function setName($isNameProvided = null) {
303 290 
         if ($isNameProvided) {
304 291 
             $this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING);
305 292 
         }

@@ -312,8 +299,7 @@  discard block
 
 block discarded – undo
312 299 
      *
313 300 
      * @return int
314 301 
      */
315 
-    public function getWidth()
316 
-    {
302 
+    public function getWidth() {
317 303 
         if ($this->width != null) {
318 304 
             return $this->width;
319 305 
         }

@@ -327,8 +313,7 @@  discard block
 
 block discarded – undo
327 313 
      *
328 314 
      * @return int
329 315 
      */
330 
-    public function getHeight()
331 
-    {
316 
+    public function getHeight() {
332 317 
         if ($this->height != null) {
333 318 
             return $this->height;
334 319 
         }

@@ -342,8 +327,7 @@  discard block
 
 block discarded – undo
342 327 
      *
343 328 
      * @return string
344 329 
      */
345 
-    public function getLocation()
346 
-    {
330 
+    public function getLocation() {
347 331 
         if (!$this->location) {
348 332 
             $this->setLocation();
349 333 
         }

@@ -359,8 +343,7 @@  discard block
 
 block discarded – undo
359 343 
      *
360 344 
      * @return $this
361 345 
      */
362 
-    public function setLocation($dir = 'bulletproof', $permission = 0666)
363 
-    {
346 
+    public function setLocation($dir = 'bulletproof', $permission = 0666) {
364 347 
         if (!file_exists($dir) && !is_dir($dir) && !$this->location) {
365 348 
             $createFolder = @mkdir('' . $dir, (int) $permission, true);
366 349 
             if (!$createFolder) {

@@ -383,8 +366,7 @@  discard block
 
 block discarded – undo
383 366 
      * This methods validates and uploads the image
384 367 
      * @return false|null|Image
385 368 
      */
386 
-    public function upload()
387 
-    {
369 
+    public function upload() {
388 370 
         /* modify variable names for convenience */
389 371 
         $image = $this;
390 372 
         $files = $this->_files;

@@ -454,8 +436,7 @@  discard block
 
 block discarded – undo
454 436 
      *
455 437 
      * @return bool
456 438 
      */
457 
-    public function moveUploadedFile($tmp_name, $destination)
458 
-    {
439 
+    public function moveUploadedFile($tmp_name, $destination) {
459 440 
         return move_uploaded_file($tmp_name, $destination);
460 441 
     }
461 442 
 }
462 443 
\ No newline at end of file
Please login to merge, or discard this patch.