rudiedirkx / fuelly

lib/fuelly/src/Client.php

Spacing +54 added lines, -54 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * Dependency constructor
 	 */
-	public function __construct( WebAuth $auth, InputConversion $input ) {
+	public function __construct(WebAuth $auth, InputConversion $input) {
 		$this->auth = $auth;
 		$this->input = $input;
 	}
@@ -43,16 +43,16 @@ 
 	/**
 	 *
 	 */
-	public function getFuelUp( $id ) {
+	public function getFuelUp($id) {
 		$fuelup = compact('id');
 
-		$response = $this->_get('fuelups/' . $id . '/edit');
+		$response = $this->_get('fuelups/'.$id.'/edit');
 
 		preg_match_all('#<input[\s\S]+?name="([^"]+)"[\s\S]+?>#', $response->body, $matches, PREG_SET_ORDER);
-		foreach ( $matches as $match ) {
-			if ( in_array($match[1], array('_token', 'miles_last_fuelup', 'price_per_unit', 'amount', 'fuelup_date')) ) {
+		foreach ($matches as $match) {
+			if (in_array($match[1], array('_token', 'miles_last_fuelup', 'price_per_unit', 'amount', 'fuelup_date'))) {
 				preg_match('#value="([^"]+)"#', $match[0], $match2);
-				$fuelup[ $match[1] ] = $match2[1];
+				$fuelup[$match[1]] = $match2[1];
 			}
 		}
 
@@ -65,17 +65,17 @@ 
 	/**
 	 *
 	 */
-	public function updateFuelUp( $id, $data ) {
+	public function updateFuelUp($id, $data) {
 		$data = $this->_validateFuelUpData($data);
 		unset($data['id']);
 
-		if ( !isset($data['_token']) ) {
-			$response = $this->_get('fuelups/' . $id . '/edit');
+		if (!isset($data['_token'])) {
+			$response = $this->_get('fuelups/'.$id.'/edit');
 			$data['_token'] = $this->extractFormToken($response->body);
 		}
 
 		$data['_method'] = 'PUT';
-		$response = $this->_post('fuelups/' . $id, array(
+		$response = $this->_post('fuelups/'.$id, array(
 			'data' => $data,
 		));
 		return $response->code == 302;
@@ -84,7 +84,7 @@ 
 	/**
 	 *
 	 */
-	public function _validateFuelUpData( $data ) {
+	public function _validateFuelUpData($data) {
 		$data += array(
 			'errorlevel' => 2,
 			'price_per_unit' => '',
@@ -101,8 +101,8 @@ 
 
 		$required = array('usercar_id', 'miles_last_fuelup', 'amount');
 		$missing = array_diff($required, array_keys(array_filter($data)));
-		if ( $missing ) {
-			throw new InvalidArgumentException('Missing params: ' . implode(', ', $missing));
+		if ($missing) {
+			throw new InvalidArgumentException('Missing params: '.implode(', ', $missing));
 		}
 
 		return $data;
@@ -111,19 +111,19 @@ 
 	/**
 	 *
 	 */
-	public function getFuelUpsWithIds( Vehicle $vehicle, $limit = 15 ) {
+	public function getFuelUpsWithIds(Vehicle $vehicle, $limit = 15) {
 		$query = http_build_query(array(
 			'iDisplayStart' => 0,
 			'iDisplayLength' => $limit,
 			'sSortDir_0' => 'desc',
 			'usercar_id' => $vehicle->id,
 		));
-		$response = $this->_get('ajax/fuelup-log?' . $query);
-		if ( $response->code == 200 ) {
-			if ( $response->response ) {
+		$response = $this->_get('ajax/fuelup-log?'.$query);
+		if ($response->code == 200) {
+			if ($response->response) {
 				$fuelups = array();
-				foreach ( $response->response['aaData'] as $fuelup ) {
-					if ( preg_match('#fuelups/(\d+)/edit#', $fuelup[0], $match) ) {
+				foreach ($response->response['aaData'] as $fuelup) {
+					if (preg_match('#fuelups/(\d+)/edit#', $fuelup[0], $match)) {
 						$fuelup = array(
 							'id' => $match[1],
 							'usercar_id' => $vehicle->id,
@@ -132,7 +132,7 @@ 
 							'amount' => $fuelup[4][0],
 						);
 
-						$fuelups[ $fuelup['id'] ] = FuelUp::createFromDetail($vehicle, $fuelup);
+						$fuelups[$fuelup['id']] = FuelUp::createFromDetail($vehicle, $fuelup);
 					}
 				}
 
@@ -149,21 +149,21 @@ 
 	/**
 	 *
 	 */
-	public function getAllFuelups( Vehicle $vehicle ) {
-		$response = $this->_get('car/make/model/2001/username/' . $vehicle->id . '/export');
-		if ( $token = $this->extractFormToken($response->body) ) {
+	public function getAllFuelups(Vehicle $vehicle) {
+		$response = $this->_get('car/make/model/2001/username/'.$vehicle->id.'/export');
+		if ($token = $this->extractFormToken($response->body)) {
 			$response = $this->_post('exportfuelups', array(
 				'data' => array(
 					'_token' => $token,
 					'usercar_id' => $vehicle->id,
 				),
 			));
-			if ( $response->code == 200 ) {
+			if ($response->code == 200) {
 				$lines = array_filter(preg_split('#[\r\n]+#', $response->body));
 				$header = $rows = array();
-				foreach ( $lines as $line ) {
+				foreach ($lines as $line) {
 					$row = array_map('trim', str_getcsv($line));
-					if ( !$header ) {
+					if (!$header) {
 						$header = $row;
 					}
 					else {
@@ -179,26 +179,26 @@ 
 	/**
 	 *
 	 */
-	public function addFuelUp( $data ) {
+	public function addFuelUp($data) {
 		$data = $this->_validateFuelUpData($data);
 
 		// GET /fuelups/create
 		$response = $this->_get('fuelups/create');
 
-		if ( $token = $this->extractFormToken($response->body) ) {
+		if ($token = $this->extractFormToken($response->body)) {
 			$data['_token'] = $token;
 
 			// POST /fuelups/create
 			$response = $this->_post('fuelups', array(
 				'data' => $data,
 			));
-			if ( $response->code == 302 ) {
+			if ($response->code == 302) {
 				$response = $this->_get($response->headers['location'][0]);
 
 				// Take new fuelup ID from response and add it
-				if ( $response->code == 200 ) {
-					$regex = '#' . preg_quote($this->base, '#') . 'fuelups/(\d+)/edit#';
-					if ( preg_match($regex, $response->body, $match) ) {
+				if ($response->code == 200) {
+					$regex = '#'.preg_quote($this->base, '#').'fuelups/(\d+)/edit#';
+					if (preg_match($regex, $response->body, $match)) {
 						$response->fuelup_id = $match[1];
 					}
 				}
@@ -211,7 +211,7 @@ 
 	/**
 	 *
 	 */
-	public function getVehicle( $id ) {
+	public function getVehicle($id) {
 		$vehicles = $this->getVehicles();
 		return @$vehicles[$id];
 	}
@@ -227,11 +227,11 @@ 
 	/**
 	 *
 	 */
-	protected function extractVehicles( $html ) {
+	protected function extractVehicles($html) {
 		$regex = '#<ul class="dashboard-vehicle" data-clickable="([^"]+)">[\w\W]+?</ul>#';
 		$vehicles = array();
-		if ( preg_match_all($regex, $html, $matches) ) {
-			foreach ( $matches[0] as $i => $html ) {
+		if (preg_match_all($regex, $html, $matches)) {
+			foreach ($matches[0] as $i => $html) {
 				$url = $matches[1][$i];
 
 				preg_match('#/(\d+)$#', $url, $match);
@@ -241,7 +241,7 @@ 
 				$name = htmlspecialchars_decode($match[1]);
 
 				preg_match("#:\s*url\('/([^']+)'\)#", $html, $match);
-				$image = $this->base . $match[1];
+				$image = $this->base.$match[1];
 
 				preg_match("#data-trend='([^']+)'#", $html, $match);
 				$trend = @json_decode($match[1], true) ?: false;
@@ -257,14 +257,14 @@ 
 	 *
 	 */
 	public function logIn() {
-		if ( !$this->auth->mail || !$this->auth->pass ) {
+		if (!$this->auth->mail || !$this->auth->pass) {
 			return false;
 		}
 
 		// GET /login
 		$response = $this->_get('login', array('login' => true));
 
-		if ( $token = $this->extractFormToken($response->body) ) {
+		if ($token = $this->extractFormToken($response->body)) {
 			// POST /login
 			$response = $this->_post('login', array(
 				'login' => true,
@@ -286,14 +286,14 @@ 
 	 *
 	 */
 	public function checkSession() {
-		if ( !$this->auth->session ) {
+		if (!$this->auth->session) {
 			return false;
 		}
 
 		$response = $this->_get('dashboard');
-		if ( $response->code == 200 ) {
-			$regex = '#<a href="' . preg_quote($this->base, '#') . 'driver/([\w\d]+)/edit">Settings</a>#';
-			if ( preg_match($regex, $response->body, $match) ) {
+		if ($response->code == 200) {
+			$regex = '#<a href="'.preg_quote($this->base, '#').'driver/([\w\d]+)/edit">Settings</a>#';
+			if (preg_match($regex, $response->body, $match)) {
 				$this->username = $match[1];
 
 				// Since we're downloading /dashboard anyway, let's extract our vehicles from it
@@ -310,7 +310,7 @@ 
 	 *
 	 */
 	public function ensureSession() {
-		if ( !$this->checkSession() ) {
+		if (!$this->checkSession()) {
 			return $this->logIn();
 		}
 
@@ -320,9 +320,9 @@ 
 	/**
 	 *
 	 */
-	protected function extractFormToken( $html ) {
-		if ( preg_match('#<input.+?name="_token".+?>#i', $html, $match) ) {
-			if ( preg_match('#value="([^"]+)"#', $match[0], $match) ) {
+	protected function extractFormToken($html) {
+		if (preg_match('#<input.+?name="_token".+?>#i', $html, $match)) {
+			if (preg_match('#value="([^"]+)"#', $match[0], $match)) {
 				return $match[1];
 			}
 		}
@@ -333,30 +333,30 @@ 
 	/**
 	 * HTTP GET
 	 */
-	public function _get( $uri, $options = array() ) {
+	public function _get($uri, $options = array()) {
 		return $this->_http($uri, $options + array('method' => 'GET'));
 	}
 
 	/**
 	 * HTTP POST
 	 */
-	public function _post( $uri, $options = array() ) {
+	public function _post($uri, $options = array()) {
 		return $this->_http($uri, $options + array('method' => 'POST'));
 	}
 
 	/**
 	 * HTTP URL
 	 */
-	public function _url( $uri, $options = array() ) {
+	public function _url($uri, $options = array()) {
 		$base = !empty($options['login']) ? $this->loginBase : $this->base;
-		$url = strpos($uri, '://') ? $uri : $base . $uri;
+		$url = strpos($uri, '://') ? $uri : $base.$uri;
 		return $url;
 	}
 
 	/**
 	 * HTTP REQUEST
 	 */
-	public function _http( $uri, $options = array() ) {
+	public function _http($uri, $options = array()) {
 		if ($this->auth->session) {
 			$options['cookies'][] = array('fuelly_session', $this->auth->session);
 		}
@@ -364,7 +364,7 @@ 
 		$url = $this->_url($uri, $options);
 
 		$log = array();
-		$log['req'] = $options['method'] . ' ' . $url;
+		$log['req'] = $options['method'].' '.$url;
 		$this->log[] = &$log;
 
 		$_start = microtime(1);
@@ -373,7 +373,7 @@ 
 		$response = $request->request();
 		$_time = microtime(1) - $_start;
 
-		$log['rsp'] = $response->code . ' ' . $response->status;
+		$log['rsp'] = $response->code.' '.$response->status;
 		$log['time'] = $_time;
 
 		return $response;