View GitHub Repository bulletproof

Schedule Inspection
Subscribe
Completed
Branch — prettify (33e9a9)
by samayo
04:02
created
Status
Category
Toggle Patches
src/bulletproof.php 3 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -357,7 +357,7 @@  discard block
 
 block discarded – undo
357 357 
     /**
358 358 
      * Validate directory/permission before creating a folder
359 359 
      *
360 
-     * @param $dir string the folder name to check
360 
+     * @param string $dir string the folder name to check
361 361 
      * @return bool
362 362 
      */
363 363 
     private function isDirectoryValid($dir) 

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

@@ -136,8 +135,7 @@  discard block
 
 block discarded – undo
136 135 
      * @param mixed $offset
137 136 
      * @return string|boolean
138 137 
      */
139 
-    public function offsetGet($offset)
140 
-    {
138 
+    public function offsetGet($offset) {
141 139
142 140 
       // return false if $image['key'] isn't found
143 141 
       if (!isset($this->_files[$offset])) {

@@ -163,11 +161,10 @@  discard block
 
 block discarded – undo
163 161 
      *
164 162 
      * @return $this
165 163 
      */
166 
-    public function setDimension($maxWidth, $maxHeight)
167 
-    {
164 
+    public function setDimension($maxWidth, $maxHeight) {
168 165 
       if( (int) $maxWidth && (int) $maxHeight){
169 166 
         $this->dimensions = array($maxWidth, $maxHeight);
170 
-      }else{
167 
+      } else{
171 168 
         $this->error = 'Invalid dimention! Values must be integers';
172 169 
       }
173 170 
 

@@ -179,8 +176,7 @@  discard block
 
 block discarded – undo
179 176 
      *
180 177 
      * @return string
181 178 
      */
182 
-    public function getFullPath()
183 
-    {
179 
+    public function getFullPath() {
184 180 
       return $this->fullPath = $this->getLocation() . '/' . $this->getName() . '.' . $this->getMime();
185 181 
     }
186 182 
 

@@ -189,8 +185,7 @@  discard block
 
 block discarded – undo
189 185 
      *
190 186 
      * @return int
191 187 
      */
192 
-    public function getSize()
193 
-    {
188 
+    public function getSize() {
194 189 
       return (int) $this->_files['size'];
195 190 
     }
196 191 
 

@@ -202,8 +197,7 @@  discard block
 
 block discarded – undo
202 197 
      *
203 198 
      * @return $this
204 199 
      */
205 
-    public function setSize($min, $max)
206 
-    {
200 
+    public function setSize($min, $max) {
207 201 
       $this->size = array($min, $max);
208 202 
       return $this;
209 203 
     }

@@ -213,8 +207,7 @@  discard block
 
 block discarded – undo
213 207 
      *
214 208 
      * @return string
215 209 
      */
216 
-    public function getJson()
217 
-    {
210 
+    public function getJson() {
218 211 
       return json_encode (
219 212 
         array(
220 213 
           'name'      => $this->name,

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

@@ -249,8 +241,7 @@  discard block
 
 block discarded – undo
249 241 
      *
250 242 
      * @return $this
251 243 
      */
252 
-    public function setMime(array $fileTypes)
253 
-    {
244 
+    public function setMime(array $fileTypes) {
254 245 
       $this->mimeTypes = $fileTypes;
255 246 
       return $this;
256 247 
     }

@@ -262,8 +253,7 @@  discard block
 
 block discarded – undo
262 253 
      *
263 254 
      * @return null|string
264 255 
      */
265 
-    protected function getImageMime($tmp_name)
266 
-    {
256 
+    protected function getImageMime($tmp_name) {
267 257 
       $this->mime = @$this->acceptedMimes[exif_imagetype($tmp_name)];
268 258 
       if (!$this->mime) {
269 259 
         return null;

@@ -277,8 +267,7 @@  discard block
 
 block discarded – undo
277 267 
      *
278 268 
      * @return string|false
279 269 
      */
280 
-    public function getError()
281 
-    {
270 
+    public function getError() {
282 271 
       return $this->error;
283 272 
     }
284 273 
 

@@ -287,8 +276,7 @@  discard block
 
 block discarded – undo
287 276 
      *
288 277 
      * @return string
289 278 
      */
290 
-    public function getName()
291 
-    {
279 
+    public function getName() {
292 280 
       if (!$this->name) {
293 281 
         $this->name = uniqid('', true) . '_' . str_shuffle(implode(range('e', 'q')));
294 282 
       }

@@ -302,8 +290,7 @@  discard block
 
 block discarded – undo
302 290 
      * @param null $isNameProvided
303 291 
      * @return $this
304 292 
      */
305 
-    public function setName($isNameProvided = null)
306 
-    {
293 
+    public function setName($isNameProvided = null) {
307 294 
       if ($isNameProvided) {
308 295 
         $this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING);
309 296 
       }

@@ -316,8 +303,7 @@  discard block
 
 block discarded – undo
316 303 
      *
317 304 
      * @return int
318 305 
      */
319 
-    public function getWidth()
320 
-    {
306 
+    public function getWidth() {
321 307 
       if ($this->width != null) {
322 308 
         return $this->width;
323 309 
       }

@@ -331,8 +317,7 @@  discard block
 
 block discarded – undo
331 317 
      *
332 318 
      * @return int
333 319 
      */
334 
-    public function getHeight()
335 
-    {
320 
+    public function getHeight() {
336 321 
       if ($this->height != null) {
337 322 
         return $this->height;
338 323 
       }

@@ -346,8 +331,7 @@  discard block
 
 block discarded – undo
346 331 
      *
347 332 
      * @return string
348 333 
      */
349 
-    public function getLocation()
350 
-    {
334 
+    public function getLocation() {
351 335 
       if (!$this->location) {
352 336 
         $this->setLocation();
353 337 
       }

@@ -361,8 +345,7 @@  discard block
 
 block discarded – undo
361 345 
      * @param $dir string the folder name to check
362 346 
      * @return bool
363 347 
      */
364 
-    private function isDirectoryValid($dir)
365 
-    {
348 
+    private function isDirectoryValid($dir) {
366 349 
       return !file_exists($dir) && !is_dir($dir) || is_writable($dir);
367 350 
     }
368 351 
 

@@ -373,8 +356,7 @@  discard block
 
 block discarded – undo
373 356 
      * @param int $permission chmod permission
374 357 
      * @return $this
375 358 
      */
376 
-    public function setLocation($dir = 'bulletproof', $permission = 0666)
377 
-    {
359 
+    public function setLocation($dir = 'bulletproof', $permission = 0666) {
378 360 
       $isDirectoryValid = $this->isDirectoryValid($dir);
379 361
380 362 
       if(!$isDirectoryValid){

@@ -399,8 +381,7 @@  discard block
 
 block discarded – undo
399 381 
      *
400 382 
      * @return false|null|Image
401 383 
      */
402 
-    public function upload()
403 
-    {
384 
+    public function upload() {
404 385 
       if ($this->error || !isset($this->_files['tmp_name'])) {
405 386 
         return false;
406 387 
       }

@@ -451,8 +432,7 @@  discard block
 
 block discarded – undo
451 432 
      *
452 433 
      * @return bool
453 434 
      */
454 
-    protected function isSaved($tmp_name, $destination)
455 
-    {
435 
+    protected function isSaved($tmp_name, $destination) {
456 436 
       return move_uploaded_file($tmp_name, $destination);
457 437 
     }
458 438 
 }
459 439 
\ No newline at end of file
Please login to merge, or discard this patch.