PatrykKosiba / currency-converter

index.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 	
-	require __DIR__ .'/vendor/autoload.php';
+	require __DIR__.'/vendor/autoload.php';
 	
 	$value = new CConverter\Converter('YOUR_API_KEY');
 	echo $value->cconv('EUR', 'USD');

src/Calculate/CalculateInterface.php

Indentation +5 added lines, -5 removed lines

@@ -5,15 +5,15 @@
 interface CalculateInterface
 {
 	/**
-         * currency conversion, cache check and fixer.io api connection
-         *
-         * @param  string|array   $getFrom
+	 * currency conversion, cache check and fixer.io api connection
+	 *
+	 * @param  string|array   $getFrom
 	 * @param  string|array   $getTo
 	 * @param  float          $amount
 	 * @param  int            $short
 	 * @param  bool 		  $isCache
 	 * @param  int   		  $cacheTime
-         * @return string|array
-         */
+	 * @return string|array
+	 */
 	public function getValues($from, $to, $amount, $short, $isCache, $cacheTime);
 }

src/Calculate/Calculate.php

Indentation +22 added lines, -22 removed lines

@@ -7,21 +7,21 @@ 
 class Calculate implements CalculateInterface
 {
 	/**
-         * @var contains fixer.io api key string
-         */
+	 * @var contains fixer.io api key string
+	 */
 	protected $api_key;
 	
 	/**
-         * @const contains fixer.io API URL
-         */
+	 * @const contains fixer.io API URL
+	 */
 	const API_URL = "http://data.fixer.io/api/latest";
 	
 	/**
-         * get api key
-         *
-         * @param  string $key
-         * @return bool
-         */
+	 * get api key
+	 *
+	 * @param  string $key
+	 * @return bool
+	 */
 	public function __construct($key)
 	{
 		$this->api_key = $key;
@@ -30,12 +30,12 @@ 
 	}
 	
 	/**
-         * change or not float decimals
-         *
-         * @param  float $calc
+	 * change or not float decimals
+	 *
+	 * @param  float $calc
 	 * @param  int   $short
-         * @return float
-         */
+	 * @return float
+	 */
 	public static function roundValue($calc, $short)
 	{
 		if($short){ $number = 2; }else{ $number = 5; }
@@ -45,16 +45,16 @@ 
 	}
 	
 	/**
-         * currency conversion, cache check and fixer.io api connection
-         *
-         * @param  string|array   $getFrom
+	 * currency conversion, cache check and fixer.io api connection
+	 *
+	 * @param  string|array   $getFrom
 	 * @param  string|array   $getTo
 	 * @param  float          $amount
 	 * @param  int            $short
 	 * @param  bool 		  $isCache
 	 * @param  int   		  $cacheTime
-         * @return string|array
-         */
+	 * @return string|array
+	 */
 	public function getValues($getFrom, $getTo, $amount, $short, $isCache, $cacheTime)
 	{
 		if($isCache && CacheFile::isCacheDir()){
@@ -118,11 +118,11 @@ 
 	
 	/**
 	 * validate errors in conncection with fixer.io api
-         *
+	 *
 	 * @param  string|array	 $data
-         * @return bool
+	 * @return bool
 	 * @throws Exception\InvalidArgumentException
-         */
+	 */
 	public function validateErrors($data)
 	{
 		if(!$data->success){

Spacing +23 added lines, -23 removed lines

@@ -38,7 +38,7 @@ 
          */
 	public static function roundValue($calc, $short)
 	{
-		if($short){ $number = 2; }else{ $number = 5; }
+		if ($short) { $number = 2; }else { $number = 5; }
 		$output = round($calc, $number);
 		
 		return $output;
@@ -57,60 +57,60 @@ 
          */
 	public function getValues($getFrom, $getTo, $amount, $short, $isCache, $cacheTime)
 	{
-		if($isCache && CacheFile::isCacheDir()){
-			if(CacheFile::isFile()){
+		if ($isCache && CacheFile::isCacheDir()) {
+			if (CacheFile::isFile()) {
 				$file = CacheFile::getFileName();
-				if(CacheFile::isCurrent($file)){
+				if (CacheFile::isCurrent($file)) {
 					$data = CacheFile::getCache($file);
-				}else{
+				}else {
 					$data = file_get_contents(self::API_URL."?access_key=".$this->api_key);
 					CacheFile::setNewCacheFile($file, $data, $cacheTime);
 				}
-			}else{
+			}else {
 				$data = file_get_contents(self::API_URL."?access_key=".$this->api_key);
 				CacheFile::setNewCacheFile(false, $data, $cacheTime);
 			}
-		}else{
+		}else {
 			$data = file_get_contents(self::API_URL."?access_key=".$this->api_key);
 		}
 		$data = json_decode($data);
 		
-		if($this->validateErrors($data)){
-			if(is_array($getFrom) || is_array($getTo)){
+		if ($this->validateErrors($data)) {
+			if (is_array($getFrom) || is_array($getTo)) {
 				$newArray = array();
 				
-				if(is_array($getFrom)){
-					if(is_array($getTo)){
-						foreach($getFrom as $currency){
+				if (is_array($getFrom)) {
+					if (is_array($getTo)) {
+						foreach ($getFrom as $currency) {
 							$getA = $data->rates->$currency;
-							foreach($getTo as $currency2){
+							foreach ($getTo as $currency2) {
 								$getB = $data->rates->$currency2;
-								$calc = Calculate::roundValue(($amount * $getB)/$getA, $short);
+								$calc = Calculate::roundValue(($amount*$getB)/$getA, $short);
 								array_push($newArray, array($currency, array($currency2 => $calc)));
 							}
 						}
-					}else{
-						foreach($getFrom as $currency){
+					}else {
+						foreach ($getFrom as $currency) {
 							$getA = $data->rates->$currency;
 							$getB = $data->rates->$getTo;
-							$calc = Calculate::roundValue(($amount * $getB)/$getA, $short);
+							$calc = Calculate::roundValue(($amount*$getB)/$getA, $short);
 							array_push($newArray, array($currency, array($getTo => $calc)));
 						}
 					}
-				}else{
-					foreach($getTo as $currency){
+				}else {
+					foreach ($getTo as $currency) {
 						$getA = $data->rates->$getFrom;
 						$getB = $data->rates->$currency;
-						$calc = Calculate::roundValue(($amount * $getB)/$getA, $short);
+						$calc = Calculate::roundValue(($amount*$getB)/$getA, $short);
 						array_push($newArray, array($getFrom, array($currency => $calc)));
 					}
 				}
 				$output = $newArray;
-			}else{
+			}else {
 				$getA = $data->rates->$getFrom;
 				$getB = $data->rates->$getTo;
 				
-				$output = Calculate::roundValue(($amount * $getB)/$getA, $short);
+				$output = Calculate::roundValue(($amount*$getB)/$getA, $short);
 			}
 		}
 		return $output;
@@ -125,7 +125,7 @@ 
          */
 	public function validateErrors($data)
 	{
-		if(!$data->success){
+		if (!$data->success) {
 			$getErrorCode = $data->error->code;
 			$getErrorInfo = $data->error->info;
 			throw new \InvalidArgumentException("[$getErrorCode] $getErrorInfo");

Braces +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
          */
 	public static function roundValue($calc, $short)
 	{
-		if($short){ $number = 2; }else{ $number = 5; }
+		if($short){ $number = 2; } else{ $number = 5; }
 		$output = round($calc, $number);
 		
 		return $output;
@@ -62,15 +62,15 @@ 
 				$file = CacheFile::getFileName();
 				if(CacheFile::isCurrent($file)){
 					$data = CacheFile::getCache($file);
-				}else{
+				} else{
 					$data = file_get_contents(self::API_URL."?access_key=".$this->api_key);
 					CacheFile::setNewCacheFile($file, $data, $cacheTime);
 				}
-			}else{
+			} else{
 				$data = file_get_contents(self::API_URL."?access_key=".$this->api_key);
 				CacheFile::setNewCacheFile(false, $data, $cacheTime);
 			}
-		}else{
+		} else{
 			$data = file_get_contents(self::API_URL."?access_key=".$this->api_key);
 		}
 		$data = json_decode($data);
@@ -89,7 +89,7 @@ 
 								array_push($newArray, array($currency, array($currency2 => $calc)));
 							}
 						}
-					}else{
+					} else{
 						foreach($getFrom as $currency){
 							$getA = $data->rates->$currency;
 							$getB = $data->rates->$getTo;
@@ -97,7 +97,7 @@ 
 							array_push($newArray, array($currency, array($getTo => $calc)));
 						}
 					}
-				}else{
+				} else{
 					foreach($getTo as $currency){
 						$getA = $data->rates->$getFrom;
 						$getB = $data->rates->$currency;
@@ -106,7 +106,7 @@ 
 					}
 				}
 				$output = $newArray;
-			}else{
+			} else{
 				$getA = $data->rates->$getFrom;
 				$getB = $data->rates->$getTo;
 				

src/ConverterCurrency.php

Indentation +7 added lines, -7 removed lines

@@ -7,10 +7,10 @@ 
 	/**
 	 * country code and currency code contains gold, silver and bitcoin currency
 	 *
-         * @var array
-         */
+	 * @var array
+	 */
 	protected static $countrys = array(
-        'AED' => 'AE',
+		'AED' => 'AE',
 		'AFN' => 'AF',
 		'ALL' => 'AL',
 		'AMD' => 'AM',
@@ -178,14 +178,14 @@ 
 		'ZMK' => 'ZM',
 		'ZMW' => 'ZM',
 		'ZWL' => 'ZW'
-    );
+	);
 	
 	/**
 	 * check currency code and transform country code to currency code
-         *
+	 *
 	 * @param  string|array	 $data
-         * @return string|array|bool
-         */
+	 * @return string|array|bool
+	 */
 	public static function getCurrency($data)
 	{
 		$base = array_flip(self::$countrys);

Spacing +10 added lines, -10 removed lines

@@ -189,20 +189,20 @@
 	public static function getCurrency($data)
 	{
 		$base = array_flip(self::$countrys);
-		if(strlen($data)==2){
-			if(array_key_exists($data, $base)) {
-				foreach($base as $key => $value){
-					if($key==$data) $output = $value;
+		if (strlen($data)==2) {
+			if (array_key_exists($data, $base)) {
+				foreach ($base as $key => $value) {
+					if ($key==$data) $output = $value;
 				}
-			}else{
+			}else {
 				$output = false;
 			}
-		}else if(strlen($data)==3){
-			foreach($base as $key => $value){
-				if($value==$data) $output = $value;
+		}else if (strlen($data)==3) {
+			foreach ($base as $key => $value) {
+				if ($value==$data) $output = $value;
 			}
-			if(!$output) $output = false;
-		}else{
+			if (!$output) $output = false;
+		}else {
 			$outut = false;
 		}
 		return $output;

Braces +12 added lines, -6 removed lines

@@ -192,17 +192,23 @@
 		if(strlen($data)==2){
 			if(array_key_exists($data, $base)) {
 				foreach($base as $key => $value){
-					if($key==$data) $output = $value;
+					if($key==$data) {
+						$output = $value;
+					}
 				}
-			}else{
+			} else{
 				$output = false;
 			}
-		}else if(strlen($data)==3){
+		} else if(strlen($data)==3){
 			foreach($base as $key => $value){
-				if($value==$data) $output = $value;
+				if($value==$data) {
+					$output = $value;
+				}
+			}
+			if(!$output) {
+				$output = false;
 			}
-			if(!$output) $output = false;
-		}else{
+		} else{
 			$outut = false;
 		}
 		return $output;

src/Converter.php

Indentation +27 added lines, -27 removed lines

@@ -8,37 +8,37 @@ 
 class Converter implements ConverterInterface
 {
 	/**
-         * @var contains fixer.io api key string
-         */
+	 * @var contains fixer.io api key string
+	 */
 	protected $api_key;
 	
 	/**
 	 * sortage api key lenght 
 	 *
-         * @var int
-         */
+	 * @var int
+	 */
 	public $api_length = 32;
 	
 	/**
 	 * sortage cache or not 
- 	 *
-         * @var bool
-         */
+	 *
+	 * @var bool
+	 */
 	public $isCache = false;
 	
 	/**
 	 * contains storage cache in minutes
 	 *
-         * @var int
-         */
+	 * @var int
+	 */
 	public $cacheTime = 60;
 	
 	/**
-         * connect with API fixer.io
-         *
-         * @param  string $api_key
-         * @return bool
-         */
+	 * connect with API fixer.io
+	 *
+	 * @param  string $api_key
+	 * @return bool
+	 */
 	public function __construct($api_key)
 	{
 		if(strlen($api_key)==$this->api_length){
@@ -52,13 +52,13 @@ 
 	
 	/**
 	 * initial currency conversion
-         *
-         * @param  string|array $from
+	 *
+	 * @param  string|array $from
 	 * @param  string|array $to
 	 * @param  float 		$amount
 	 * @param  bool			$short
-         * @return string|array
-         */
+	 * @return string|array
+	 */
 	public function cconv($from, $to, $amount = 1, $short = false)
 	{
 		$getFrom = $this->checkInput($from);
@@ -73,10 +73,10 @@ 
 	
 	/**
 	 * validate input data
-         *
+	 *
 	 * @param  string $data
-         * @return bool
-         */
+	 * @return bool
+	 */
 	public function validateInput($data)
 	{
 		if(strlen($data)==2 || strlen($data)==3){
@@ -89,11 +89,11 @@ 
 	
 	/**
 	 * initial cache or not
-         *
+	 *
 	 * @param  bool	 $is
 	 * @param  int	 $time
-         * @return bool
-         */
+	 * @return bool
+	 */
 	public function cache($is = false, $time = 60)
 	{
 		$parm = Cache::setCache($is, $time);
@@ -105,11 +105,11 @@ 
 	
 	/**
 	 * check input data for validator
-         *
+	 *
 	 * @param  string|array	 $data
-         * @return string|array
+	 * @return string|array
 	 * @throws Exception\InvalidArgumentException
-         */
+	 */
 	protected function checkInput($data)
 	{
 		if(is_string($data)){

Spacing +10 added lines, -10 removed lines

@@ -41,9 +41,9 @@ 
          */
 	public function __construct($api_key)
 	{
-		if(strlen($api_key)==$this->api_length){
+		if (strlen($api_key)==$this->api_length) {
 			$this->api_key = $api_key;
-		}else{
+		}else {
 			throw new Exception\InvalidArgumentException('Invalid length of API KEY');
 		}
 		
@@ -79,9 +79,9 @@ 
          */
 	public function validateInput($data)
 	{
-		if(strlen($data)==2 || strlen($data)==3){
+		if (strlen($data)==2 || strlen($data)==3) {
 			$output = ConverterCurrency::getCurrency($data);
-		}else{
+		}else {
 			$output = false;
 		}
 		return $output;
@@ -112,17 +112,17 @@ 
          */
 	protected function checkInput($data)
 	{
-		if(is_string($data)){
+		if (is_string($data)) {
 			$value = $this->validateInput($data);
-			if($value==false) throw new Exception\InvalidArgumentException('Invalid data. Please enter a valid country or currency name');
-		}else if(is_array($data)){
+			if ($value==false) throw new Exception\InvalidArgumentException('Invalid data. Please enter a valid country or currency name');
+		}else if (is_array($data)) {
 			$value = array();
-			foreach($data as $single){
+			foreach ($data as $single) {
 				$opt = $this->validateInput($single);
-				if($opt==false) throw new Exception\InvalidArgumentException('Invalid data. Please enter array with a valid country or currency names');
+				if ($opt==false) throw new Exception\InvalidArgumentException('Invalid data. Please enter array with a valid country or currency names');
 				array_push($value, $opt);
 			}
-		}else{
+		}else {
 			throw new Exception\InvalidArgumentException('Invalid data. Please use string or array value');
 		}
 		return $value;

Braces +10 added lines, -6 removed lines

@@ -43,7 +43,7 @@ 
 	{
 		if(strlen($api_key)==$this->api_length){
 			$this->api_key = $api_key;
-		}else{
+		} else{
 			throw new Exception\InvalidArgumentException('Invalid length of API KEY');
 		}
 		
@@ -81,7 +81,7 @@ 
 	{
 		if(strlen($data)==2 || strlen($data)==3){
 			$output = ConverterCurrency::getCurrency($data);
-		}else{
+		} else{
 			$output = false;
 		}
 		return $output;
@@ -114,15 +114,19 @@ 
 	{
 		if(is_string($data)){
 			$value = $this->validateInput($data);
-			if($value==false) throw new Exception\InvalidArgumentException('Invalid data. Please enter a valid country or currency name');
-		}else if(is_array($data)){
+			if($value==false) {
+				throw new Exception\InvalidArgumentException('Invalid data. Please enter a valid country or currency name');
+			}
+		} else if(is_array($data)){
 			$value = array();
 			foreach($data as $single){
 				$opt = $this->validateInput($single);
-				if($opt==false) throw new Exception\InvalidArgumentException('Invalid data. Please enter array with a valid country or currency names');
+				if($opt==false) {
+					throw new Exception\InvalidArgumentException('Invalid data. Please enter array with a valid country or currency names');
+				}
 				array_push($value, $opt);
 			}
-		}else{
+		} else{
 			throw new Exception\InvalidArgumentException('Invalid data. Please use string or array value');
 		}
 		return $value;

src/ConverterInterface.php

Indentation +4 added lines, -4 removed lines

@@ -6,12 +6,12 @@
 {
 	/**
 	 * initial currency conversion
-         *
-         * @param  string|array $from
+	 *
+	 * @param  string|array $from
 	 * @param  string|array $to
 	 * @param  float 		$amount
 	 * @param  bool			$short
-         * @return string|array
-         */
+	 * @return string|array
+	 */
 	public function cconv($from, $to, $amount);
 }

src/Cache/CacheFile.php

Indentation +18 added lines, -18 removed lines

@@ -6,9 +6,9 @@ 
 {
 	/**
 	 * check if is cache dir
-         *
-         * @return bool
-         */
+	 *
+	 * @return bool
+	 */
 	public static function isCacheDir()
 	{
 		if(!is_dir(__DIR__ .'/cache/')) mkdir(__DIR__ ."/cache/", 0700);
@@ -18,9 +18,9 @@ 
 	
 	/**
 	 * check if cache file exists
-         *
-         * @return bool
-         */
+	 *
+	 * @return bool
+	 */
 	public static function isFile()
 	{
 		$files = glob(__DIR__ .'/cache/*.txt');
@@ -36,9 +36,9 @@ 
 	
 	/**
 	 *  get name of cache file
-         *
-         * @return string
-         */
+	 *
+	 * @return string
+	 */
 	public static function getFileName()
 	{
 		$files = glob(__DIR__ .'/cache/*.txt');
@@ -51,9 +51,9 @@ 
 	
 	/**
 	 *  check if cache file is needed to update
-         *
-         * @return bool
-         */
+	 *
+	 * @return bool
+	 */
 	public static function isCurrent($file)
 	{
 		$getSourceName = explode(".", $file);
@@ -71,12 +71,12 @@ 
 	
 	/**
 	 *  create new cache file
-         *
+	 *
 	 * @param  string        $file
 	 * @param  array         $data
 	 * @param  int           $time
-         * @return bool
-         */
+	 * @return bool
+	 */
 	public static function setNewCacheFile($file, $data, $time)
 	{
 		if($file) unlink(__DIR__ .'/cache/'.$file);
@@ -92,9 +92,9 @@ 
 	
 	/**
 	 *  get cache data
-         *
-         * @return array
-         */
+	 *
+	 * @return array
+	 */
 	public static function getCache($file)
 	{
 		$data = file_get_contents(__DIR__ .'/cache/'.$file);

Spacing +10 added lines, -10 removed lines

@@ -11,7 +11,7 @@ 
          */
 	public static function isCacheDir()
 	{
-		if(!is_dir(__DIR__ .'/cache/')) mkdir(__DIR__ ."/cache/", 0700);
+		if (!is_dir(__DIR__.'/cache/')) mkdir(__DIR__."/cache/", 0700);
 		
 		return true;
 	}
@@ -23,11 +23,11 @@ 
          */
 	public static function isFile()
 	{
-		$files = glob(__DIR__ .'/cache/*.txt');
+		$files = glob(__DIR__.'/cache/*.txt');
 		$count = count($files);
-		if($count>0){
+		if ($count>0) {
 			$output = true;
-		}else{
+		}else {
 			$output = false;
 		}
 		
@@ -41,7 +41,7 @@ 
          */
 	public static function getFileName()
 	{
-		$files = glob(__DIR__ .'/cache/*.txt');
+		$files = glob(__DIR__.'/cache/*.txt');
 		$file = $files[0];
 		$fileName = explode("/cache/", $file);
 		$fileName = $fileName[1];
@@ -60,9 +60,9 @@ 
 		$getSourceName = $getSourceName[0];
 		
 		$current_time = time();
-		if($current_time>$getSourceName){
+		if ($current_time>$getSourceName) {
 			$output = false;
-		}else{
+		}else {
 			$output = true;
 		}
 		
@@ -79,13 +79,13 @@ 
          */
 	public static function setNewCacheFile($file, $data, $time)
 	{
-		if($file) unlink(__DIR__ .'/cache/'.$file);
+		if ($file) unlink(__DIR__.'/cache/'.$file);
 		
 		$current_time = time();
 		$new_time = $current_time + $time*60;
 		
 		$file_name = $new_time.".txt";
-		file_put_contents(__DIR__ .'/cache/'.$file_name, $data);
+		file_put_contents(__DIR__.'/cache/'.$file_name, $data);
 		
 		return true;
 	}
@@ -97,7 +97,7 @@ 
          */
 	public static function getCache($file)
 	{
-		$data = file_get_contents(__DIR__ .'/cache/'.$file);
+		$data = file_get_contents(__DIR__.'/cache/'.$file);
 		
 		return $data;
 	}

Braces +8 added lines, -4 removed lines

@@ -11,7 +11,9 @@ 
          */
 	public static function isCacheDir()
 	{
-		if(!is_dir(__DIR__ .'/cache/')) mkdir(__DIR__ ."/cache/", 0700);
+		if(!is_dir(__DIR__ .'/cache/')) {
+			mkdir(__DIR__ ."/cache/", 0700);
+		}
 		
 		return true;
 	}
@@ -27,7 +29,7 @@ 
 		$count = count($files);
 		if($count>0){
 			$output = true;
-		}else{
+		} else{
 			$output = false;
 		}
 		
@@ -62,7 +64,7 @@ 
 		$current_time = time();
 		if($current_time>$getSourceName){
 			$output = false;
-		}else{
+		} else{
 			$output = true;
 		}
 		
@@ -79,7 +81,9 @@ 
          */
 	public static function setNewCacheFile($file, $data, $time)
 	{
-		if($file) unlink(__DIR__ .'/cache/'.$file);
+		if($file) {
+			unlink(__DIR__ .'/cache/'.$file);
+		}
 		
 		$current_time = time();
 		$new_time = $current_time + $time*60;

src/Cache/CacheInterface.php

Indentation +4 added lines, -4 removed lines

@@ -6,10 +6,10 @@
 {
 	/**
 	 * change cache parameter
-         *
-         * @param  bool $is
+	 *
+	 * @param  bool $is
 	 * @param  int  $time
-         * @return bool
-         */
+	 * @return bool
+	 */
 	public static function setCache($is, $time);
 }

src/Cache/Cache.php

Indentation +4 added lines, -4 removed lines

@@ -6,11 +6,11 @@
 {
 	/**
 	 * change cache parameter
-         *
-         * @param  bool $is
+	 *
+	 * @param  bool $is
 	 * @param  int  $time
-         * @return bool
-         */
+	 * @return bool
+	 */
 	public static function setCache($is, $time)
 	{
 		if($is==true && is_numeric($time) && is_int($time)){

Spacing +2 added lines, -2 removed lines

@@ -13,9 +13,9 @@
          */
 	public static function setCache($is, $time)
 	{
-		if($is==true && is_numeric($time) && is_int($time)){
+		if ($is==true && is_numeric($time) && is_int($time)) {
 			$output = true;
-		}else{
+		}else {
 			$output = false;
 		}
 		return $output;

Braces +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 	{
 		if($is==true && is_numeric($time) && is_int($time)){
 			$output = true;
-		}else{
+		} else{
 			$output = false;
 		}
 		return $output;