Updated the root namespace and the vendor prefix

Martin Brecht-Precht · Martin Brecht-Precht · commit 22e778d09c78 · 2021-01-18T17:05:33.000+01:00
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Martin Brecht-Precht, Markenwerk GmbH
+Copyright (c) 2016 Martin Brecht-Precht, Chroma Experience GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 # PHP Google Geocoder
 
-[![Build Status](https://travis-ci.org/markenwerk/php-google-geocoder.svg?branch=master)](https://travis-ci.org/markenwerk/php-google-geocoder)
-[![Test Coverage](https://codeclimate.com/github/markenwerk/php-google-geocoder/badges/coverage.svg)](https://codeclimate.com/github/markenwerk/php-google-geocoder/coverage)
+[![Build Status](https://travis-ci.org/chroma-x/php-google-geocoder.svg?branch=master)](https://travis-ci.org/chroma-x/php-google-geocoder)
+[![Test Coverage](https://codeclimate.com/github/chroma-x/php-google-geocoder/badges/coverage.svg)](https://codeclimate.com/github/chroma-x/php-google-geocoder/coverage)
 [![Dependency Status](https://www.versioneye.com/user/projects/571f7841fcd19a004544233f/badge.svg)](https://www.versioneye.com/user/projects/571f7841fcd19a004544233f)
-[![Code Climate](https://codeclimate.com/github/markenwerk/php-google-geocoder/badges/gpa.svg)](https://codeclimate.com/github/markenwerk/php-google-geocoder)
-[![Latest Stable Version](https://poser.pugx.org/markenwerk/google-geocoder/v/stable)](https://packagist.org/packages/markenwerk/google-geocoder)
-[![Total Downloads](https://poser.pugx.org/markenwerk/google-geocoder/downloads)](https://packagist.org/packages/markenwerk/google-geocoder)
-[![License](https://poser.pugx.org/markenwerk/google-geocoder/license)](https://packagist.org/packages/markenwerk/google-geocoder)
+[![Code Climate](https://codeclimate.com/github/chroma-x/php-google-geocoder/badges/gpa.svg)](https://codeclimate.com/github/chroma-x/php-google-geocoder)
+[![Latest Stable Version](https://poser.pugx.org/chroma-x/google-geocoder/v/stable)](https://packagist.org/packages/chroma-x/google-geocoder)
+[![Total Downloads](https://poser.pugx.org/chroma-x/google-geocoder/downloads)](https://packagist.org/packages/chroma-x/google-geocoder)
+[![License](https://poser.pugx.org/chroma-x/google-geocoder/license)](https://packagist.org/packages/chroma-x/google-geocoder)
 
 A PHP library to query Google's location service for geolocation and reverse lookups based on a given address, a geo location or a Google Places ID.
 
@@ -15,7 +15,7 @@ A PHP library to query Google's location service for geolocation and reverse loo
 ```{json}
 {
    	"require": {
-        "markenwerk/google-geocoder": "~3.0"
+        "chroma-x/google-geocoder": "~3.0"
     }
 }
 ```
@@ -35,20 +35,20 @@ require_once('path/to/vendor/autoload.php');
 #### Resolving an address
 
 ```{php}
-use Markenwerk\CommonException;
+use ChromaX\CommonException;
 
 try{
 	// Perform lookup
-	$addressLookup = new Markenwerk\GoogleGeocode\Lookup\AddressLookup();
+	$addressLookup = new ChromaX\GoogleGeocode\Lookup\AddressLookup();
 	$addressLookup->lookup('Germany, 24105 Kiel, Lornsenstraße 43');
 
-	// Retrieving the lookup as an array of Markenwerk\GoogleGeocode\Result\GeoLookupResult instances
+	// Retrieving the lookup as an array of ChromaX\GoogleGeocode\Result\GeoLookupResult instances
 	$lookupResults = $addressLookup->getResults();
 
 	// Get the number of lookup results
 	$lookupResultCount = $addressLookup->getResultCount();
 
-	// Retrieving the first lookup result as Markenwerk\GoogleGeocode\Result\GeoLookupResult instance
+	// Retrieving the first lookup result as ChromaX\GoogleGeocode\Result\GeoLookupResult instance
 	$firstResult = $addressLookup->getFirstResult();
 
 } catch (CommonException\NetworkException\CurlException $exception) {
@@ -66,20 +66,20 @@ try{
 #### Resolving a geo location
 
 ```{php}
-use Markenwerk\CommonException;
+use ChromaX\CommonException;
 
 try{
 	// Perform lookup
-	$geoLocationLookup = new Markenwerk\GoogleGeocode\Lookup\GeoLocationLookup();
+	$geoLocationLookup = new ChromaX\GoogleGeocode\Lookup\GeoLocationLookup();
 	$geoLocationLookup->lookup(54.334123, 10.1364007);
 
-	// Retrieving the lookup as an array of Markenwerk\GoogleGeocode\Result\GeoLookupResult instances
+	// Retrieving the lookup as an array of ChromaX\GoogleGeocode\Result\GeoLookupResult instances
 	$lookupResults = $geoLocationLookup->getResults();
 
 	// Get the number of lookup results
 	$lookupResultCount = $geoLocationLookup->getResultCount();
 
-	// Retrieving the first lookup result as Markenwerk\GoogleGeocode\Result\AddressLookupResult instance
+	// Retrieving the first lookup result as ChromaX\GoogleGeocode\Result\AddressLookupResult instance
 	$firstResult = $geoLocationLookup->getFirstResult();
 
 } catch (CommonException\NetworkException\CurlException $exception) {
@@ -99,22 +99,22 @@ try{
 Resolving Google Places IDs utilizes the Google Places API. Therefore a Places API key is mandatory for performing a lookup. Please visit the [Google API console](https://console.developers.google.com/apis/api/geocoding_backend?project=_) to receive an API key.
 
 ```{php}
-use Markenwerk\CommonException;
+use ChromaX\CommonException;
 
 try{
 	// Perform lookup
-	$googlePlacesLookup = new Markenwerk\GoogleGeocode\Lookup\GooglePlacesLookup();
+	$googlePlacesLookup = new ChromaX\GoogleGeocode\Lookup\GooglePlacesLookup();
 	$googlePlacesLookup
 		->setApiKey('MY_GOOGLE_PLACES_API_KEY')
 		->lookup('ChIJ_zNzWmpWskcRP8DWT5eX5jQ');
 
-	// Retrieving the lookup as an array of Markenwerk\GoogleGeocode\Result\GeoLookupResult instances
+	// Retrieving the lookup as an array of ChromaX\GoogleGeocode\Result\GeoLookupResult instances
 	$lookupResults = $googlePlacesLookup->getResults();
 
 	// Get the number of lookup results
 	$lookupResultCount = $googlePlacesLookup->getResultCount();
 
-	// Retrieving the first lookup result as Markenwerk\GoogleGeocode\Result\AddressLookupResult instance
+	// Retrieving the first lookup result as ChromaX\GoogleGeocode\Result\AddressLookupResult instance
 	$firstResult = $googlePlacesLookup->getFirstResult();
 
 } catch (CommonException\NetworkException\CurlException $exception) {
@@ -138,10 +138,10 @@ try{
 **Attention:** Plaese note that all getter methods on the `GeoLocationAddress` return a `GeoLocationAddressComponent` instance or `null`. For preventing calls on non-objects the `GeoLocationAddress` class provides methods to check whether the address components exists. 
 
 ```{php}
-// Retrieving the first lookup result as Markenwerk\GoogleGeocode\Result\GeoLookupResult instance
+// Retrieving the first lookup result as ChromaX\GoogleGeocode\Result\GeoLookupResult instance
 $firstResult = $addressLookup->getFirstResult();
 
-// Retieving address information as Markenwerk\GoogleGeocode\GeoLocation\GeoLocationAddress
+// Retieving address information as ChromaX\GoogleGeocode\GeoLocation\GeoLocationAddress
 $geoLocationAddress = $firstResult->getAddress();
 
 if($firstResult->hasAddress()) {
@@ -233,13 +233,13 @@ if($firstResult->hasGooglePlacesId()) {
 ## Exception handling
 
 PHP Google Geocoder provides different exceptions provided by the PHP Common Exceptions project for proper handling.  
-You can find more information about [PHP Common Exceptions at Github](https://github.com/markenwerk/php-common-exceptions).
+You can find more information about [PHP Common Exceptions at Github](https://github.com/chroma-x/php-common-exceptions).
 
 ## Contribution
 
 Contributing to our projects is always very appreciated.  
-**But: please follow the contribution guidelines written down in the [CONTRIBUTING.md](https://github.com/markenwerk/php-google-geocoder/blob/master/CONTRIBUTING.md) document.**
+**But: please follow the contribution guidelines written down in the [CONTRIBUTING.md](https://github.com/chroma-x/php-google-geocoder/blob/master/CONTRIBUTING.md) document.**
 
 ## License
 
-PHP Google Geocoder is under the MIT license.
+PHP Google Geocoder is under the MIT license.
diff --git a/composer.json b/composer.json
@@ -1,37 +1,36 @@
 {
-  "name": "markenwerk/google-geocoder",
-  "type": "library",
-  "description": "A PHP library to query Google's location service for geolocation and reverse lookups based on a given address, a geo location or a Google Places ID.",
-  "keywords": [
-    "Google",
-    "Geolocation",
-    "Geolookup"
-  ],
-  "homepage": "http://markenwerk.net/",
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Martin Brecht-Precht",
-      "email": "mb@markenwerk.net",
-      "homepage": "http://markenwerk.net"
-    }
-  ],
-  "autoload": {
-    "psr-4": {
-      "Markenwerk\\GoogleGeocode\\": "src/"
-    }
-  },
-  "require": {
-    "php": ">=5.3",
-    "lib-curl": "*",
-    "markenwerk/common-exceptions": "~3.0",
-    "markenwerk/google-datastructures": "~2.0"
-  },
-  "require-dev":{
-    "phpunit/phpunit": "~4.8",
-    "codeclimate/php-test-reporter": "dev-master"
-  },
-  "suggest": {
-    "markenwerk/google-places-suite": "A PHP library to query Google's Places service for querying locations and addresses and getting details by Places ID."
-  }
+	"name": "chroma-x/google-geocoder",
+	"type": "library",
+	"description": "A PHP library to query Google's location service for geolocation and reverse lookups based on a given address, a geo location or a Google Places ID.",
+	"keywords": [
+		"Google",
+		"Geolocation",
+		"Geolookup"
+	],
+	"homepage": "http://chroma-x.de/",
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "Martin Brecht-Precht",
+			"email": "mb@chroma-x.de",
+			"homepage": "http://chroma-x.de"
+		}
+	],
+	"autoload": {
+		"psr-4": {
+			"ChromaX\\GoogleGeocode\\": "src/"
+		}
+	},
+	"require": {
+		"php": ">=5.3",
+		"ext-curl": "*",
+		"lib-curl": "*",
+		"ext-json": "*",
+		"chroma-x/common-exceptions": "~3.0",
+		"chroma-x/google-datastructures": "~2.0"
+	},
+	"require-dev": {
+		"phpunit/phpunit": "~4.8",
+		"codeclimate/php-test-reporter": "dev-master"
+	}
 }
diff --git a/src/Lookup/AbstractApiKeyGatedLookup.php b/src/Lookup/AbstractApiKeyGatedLookup.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Markenwerk\GoogleGeocode\Lookup;
+namespace ChromaX\GoogleGeocode\Lookup;
 
-use Markenwerk\GoogleGeocode;
+use ChromaX\GoogleGeocode;
 
 /**
  * Class AbstractApiKeyGatedLookup
  *
- * @package Markenwerk\GoogleGeocode\Lookup
+ * @package ChromaX\GoogleGeocode\Lookup
  */
 abstract class AbstractApiKeyGatedLookup extends AbstractLookup
 {
diff --git a/src/Lookup/AbstractLookup.php b/src/Lookup/AbstractLookup.php
@@ -1,15 +1,17 @@
 <?php
 
-namespace Markenwerk\GoogleGeocode\Lookup;
+namespace ChromaX\GoogleGeocode\Lookup;
 
-use Markenwerk\CommonException;
-use Markenwerk\GoogleGeocode;
-use Markenwerk\GoogleDataStructure;
+use ChromaX\CommonException;
+use ChromaX\GoogleDataStructure\GeoLocation\GeoLocationAddress;
+use ChromaX\GoogleDataStructure\GeoLocation\GeoLocationGeometry;
+use ChromaX\GoogleGeocode;
+use ChromaX\GoogleGeocode\Result\GeoLookupResult;
 
 /**
  * Class AbstractLookup
  *
- * @package Markenwerk\GoogleGeocode\Lookup
+ * @package ChromaX\GoogleGeocode\Lookup
  */
 abstract class AbstractLookup
 {
@@ -61,7 +63,7 @@ public function getResultCount()
 	 */
 	public function getFirstResult()
 	{
-		if (count($this->results) == 0) {
+		if (count($this->results) === 0) {
 			return null;
 		}
 		return $this->results[0];
@@ -108,13 +110,13 @@ private function validateResponse($rawResponse, $responseData)
 		}
 
 		$responseStatus = mb_strtoupper($responseData['status']);
-		if ($responseStatus == 'OVER_QUERY_LIMIT') {
+		if ($responseStatus === 'OVER_QUERY_LIMIT') {
 			$exceptionMessage = $this->buildExceptionMessage('Google Geocoder request limit reached', $responseData);
 			throw new CommonException\ApiException\RequestQuotaException($exceptionMessage);
-		} else if ($responseStatus == 'REQUEST_DENIED') {
+		} else if ($responseStatus === 'REQUEST_DENIED') {
 			$exceptionMessage = $this->buildExceptionMessage('Google Geocoder request was denied', $responseData);
 			throw new CommonException\ApiException\AuthenticationException($exceptionMessage);
-		} else if ($responseStatus != 'OK') {
+		} else if ($responseStatus !== 'OK') {
 			$exceptionMessage = $this->buildExceptionMessage('Google Geocoder no results', $responseData);
 			throw new CommonException\ApiException\NoResultException($exceptionMessage);
 		}
@@ -139,15 +141,15 @@ private function buildExceptionMessage($exceptionMessage, array $responseData)
 	 */
 	protected function addResultsFromResponse($responseData)
 	{
-		for ($i = 0; $i < count($responseData['results']); $i++) {
+		for ($i = 0, $n = count($responseData['results']); $i < $n; $i++) {
 			$address = $responseData['results'][$i]['address_components'];
 			$geometry = $responseData['results'][$i]['geometry'];
 			$placesId = $responseData['results'][$i]['place_id'];
-			$locationAddress = new GoogleDataStructure\GeoLocation\GeoLocationAddress();
+			$locationAddress = new GeoLocationAddress();
 			$locationAddress->setFromServiceResult($address);
-			$locationGeometry = new GoogleDataStructure\GeoLocation\GeoLocationGeometry();
+			$locationGeometry = new GeoLocationGeometry();
 			$locationGeometry->setFromServiceResult($geometry);
-			$this->addResult(new GoogleGeocode\Result\GeoLookupResult($locationAddress, $locationGeometry, $placesId));
+			$this->addResult(new GeoLookupResult($locationAddress, $locationGeometry, $placesId));
 		}
 		return $this;
 	}
diff --git a/src/Lookup/AddressLookup.php b/src/Lookup/AddressLookup.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Markenwerk\GoogleGeocode\Lookup;
+namespace ChromaX\GoogleGeocode\Lookup;
 
-use Markenwerk\CommonException;
+use ChromaX\CommonException;
 
 /**
  * Class AddressLookup
  *
- * @package Markenwerk\GoogleGeocode\Lookup
+ * @package ChromaX\GoogleGeocode\Lookup
  */
 class AddressLookup extends AbstractLookup
 {
diff --git a/src/Lookup/GeoLocationLookup.php b/src/Lookup/GeoLocationLookup.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Markenwerk\GoogleGeocode\Lookup;
+namespace ChromaX\GoogleGeocode\Lookup;
 
-use Markenwerk\CommonException;
+use ChromaX\CommonException;
 
 /**
  * Class GeoLocationLookup
  *
- * @package Markenwerk\GoogleGeocode\Lookup
+ * @package ChromaX\GoogleGeocode\Lookup
  */
 class GeoLocationLookup extends AbstractLookup
 {
diff --git a/src/Lookup/GooglePlacesLookup.php b/src/Lookup/GooglePlacesLookup.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Markenwerk\GoogleGeocode\Lookup;
+namespace ChromaX\GoogleGeocode\Lookup;
 
-use Markenwerk\CommonException;
+use ChromaX\CommonException;
 
 /**
  * Class GooglePlacesLookup
  *
- * @package Markenwerk\GoogleGeocode\Lookup
+ * @package ChromaX\GoogleGeocode\Lookup
  */
 class GooglePlacesLookup extends AbstractApiKeyGatedLookup
 {
diff --git a/src/Result/GeoLookupResult.php b/src/Result/GeoLookupResult.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Markenwerk\GoogleGeocode\Result;
+namespace ChromaX\GoogleGeocode\Result;
 
-use Markenwerk\GoogleDataStructure\GeoLocation;
+use ChromaX\GoogleDataStructure\GeoLocation;
 
 /**
  * Class GeoLookupResult
  *
- * @package Markenwerk\GoogleGeocode\Result
+ * @package ChromaX\GoogleGeocode\Result
  */
 class GeoLookupResult
 {
diff --git a/test/AddressLookupTest.php b/test/AddressLookupTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Markenwerk\GoogleGeocode\Lookup;
+namespace ChromaX\GoogleGeocode\Lookup;
 
-use Markenwerk\CommonException;
+use ChromaX\CommonException;
 
 /**
  * Class AddressLookupTest
  *
- * @package Markenwerk\GoogleGeocode
+ * @package ChromaX\GoogleGeocode
  */
 class AddressLookupTest extends \PHPUnit_Framework_TestCase
 {
@@ -21,7 +21,7 @@ public function testLookupSuccess()
 		// Validate results
 		$this->assertEquals(1, $addressLookup->getResultCount());
 		$firstResult = $addressLookup->getFirstResult();
-		$this->assertInstanceOf('Markenwerk\\GoogleGeocode\\Result\\GeoLookupResult', $firstResult);
+		$this->assertInstanceOf('ChromaX\\GoogleGeocode\\Result\\GeoLookupResult', $firstResult);
 
 		// Address result
 		$this->assertTrue($firstResult->hasAddress());
diff --git a/test/GeoLocationLookupTest.php b/test/GeoLocationLookupTest.php
diff --git a/test/GooglePlacesLookupTest.php b/test/GooglePlacesLookupTest.php

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Markenwerk\GoogleGeocode\Lookup;`
	`3`	`+namespace ChromaX\GoogleGeocode\Lookup;`
`4`	`4`
`5`		`-use Markenwerk\GoogleGeocode;`
	`5`	`+use ChromaX\GoogleGeocode;`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`* Class AbstractApiKeyGatedLookup`
`9`	`9`	`*`
`10`		`- * @package Markenwerk\GoogleGeocode\Lookup`
	`10`	`+ * @package ChromaX\GoogleGeocode\Lookup`
`11`	`11`	`*/`
`12`	`12`	`abstract class AbstractApiKeyGatedLookup extends AbstractLookup`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Markenwerk\GoogleGeocode\Result;`
	`3`	`+namespace ChromaX\GoogleGeocode\Result;`
`4`	`4`
`5`		`-use Markenwerk\GoogleDataStructure\GeoLocation;`
	`5`	`+use ChromaX\GoogleDataStructure\GeoLocation;`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`* Class GeoLookupResult`
`9`	`9`	`*`
`10`		`- * @package Markenwerk\GoogleGeocode\Result`
	`10`	`+ * @package ChromaX\GoogleGeocode\Result`
`11`	`11`	`*/`
`12`	`12`	`class GeoLookupResult`
`13`	`13`	`{`