Erikmitk / kitodo-presentation

Classes/Api/Viaf/Client.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
     public function __construct($viaf, RequestFactory $requestFactory)
     {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
-        $this->viafUrl = 'http://viaf.org/viaf/' . $viaf;
+        $this->viafUrl = 'http://viaf.org/viaf/'.$viaf;
         $this->requestFactory = $requestFactory;
     }
 
@@ -92,7 +92,7 @@ 
         try {
             $response = $this->requestFactory->request($url);
         } catch (\Exception $e) {
-            $this->logger->warning('Could not fetch data from URL "' . $url . '". Error: ' . $e->getMessage() . '.');
+            $this->logger->warning('Could not fetch data from URL "'.$url.'". Error: '.$e->getMessage().'.');
             return false;
         }
         return $response->getBody()->getContents();
@@ -105,6 +105,6 @@ 
      **/
     protected function getApiEndpoint()
     {
-        return $this->viafUrl . '/' . $this->endpoint;
+        return $this->viafUrl.'/'.$this->endpoint;
     }
 }

Braces +4 added lines, -8 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  **/
-class Client
-{
+class Client {
     /**
      * This holds the logger
      *
@@ -63,8 +62,7 @@ 
      * @param RequestFactory $requestFactory a request object to inject
      * @return void
      **/
-    public function __construct($viaf, RequestFactory $requestFactory)
-    {
+    public function __construct($viaf, RequestFactory $requestFactory) {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
         $this->viafUrl = 'http://viaf.org/viaf/' . $viaf;
         $this->requestFactory = $requestFactory;
@@ -86,8 +84,7 @@ 
      *
      * @return object|bool
      **/
-    public function getData()
-    {
+    public function getData() {
         $url = $this->getApiEndpoint();
         try {
             $response = $this->requestFactory->request($url);
@@ -103,8 +100,7 @@ 
      *
      * @return string
      **/
-    protected function getApiEndpoint()
-    {
+    protected function getApiEndpoint() {
         return $this->viafUrl . '/' . $this->endpoint;
     }
 }

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -47,14 +47,14 @@ 
      *
      * @var string
      **/
-    private $viafUrl = null;
+    private $viafUrl = NULL;
 
     /**
      * The request object
      *
      * @var RequestFactoryInterface
      **/
-    private $requestFactory = null;
+    private $requestFactory = NULL;
 
     /**
      * Constructs a new instance
@@ -93,7 +93,7 @@ 
             $response = $this->requestFactory->request($url);
         } catch (\Exception $e) {
             $this->logger->warning('Could not fetch data from URL "' . $url . '". Error: ' . $e->getMessage() . '.');
-            return false;
+            return FALSE;
         }
         return $response->getBody()->getContents();
     }

Classes/Api/Viaf/Profile.php

Braces +6 added lines, -12 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  **/
-class Profile
-{
+class Profile {
     /**
      * This holds the logger
      *
@@ -57,8 +56,7 @@ 
      *
      * @return void
      **/
-    public function __construct($viaf)
-    {
+    public function __construct($viaf) {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
         $this->client = new Client($viaf, GeneralUtility::makeInstance(RequestFactory::class));
     }
@@ -68,8 +66,7 @@ 
      *
      * @return array|false
      **/
-    public function getData()
-    {
+    public function getData() {
         $this->getRaw();
         if (!empty($this->raw)) {
             $data = [];
@@ -87,8 +84,7 @@ 
      *
      * @return string|false
      **/
-    public function getAddress()
-    {
+    public function getAddress() {
         $this->getRaw();
         if (!empty($this->raw->asXML())) {
             return (string) $this->raw->xpath('./ns1:nationalityOfEntity/ns1:data/ns1:text')[0];
@@ -103,8 +99,7 @@ 
      *
      * @return string|false
      **/
-    public function getFullName()
-    {
+    public function getFullName() {
         $this->getRaw();
         if (!empty($this->raw->asXML())) {
             $rawName = $this->raw->xpath('./ns1:mainHeadings/ns1:data/ns1:text');
@@ -122,8 +117,7 @@ 
      *
      * @return void
      **/
-    protected function getRaw()
-    {
+    protected function getRaw() {
         $data = $this->client->getData();
         if (!isset($this->raw) && $data != false) {
             $this->raw = Helper::getXmlFileAsString($data);

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
      *
      * @var \SimpleXmlElement|false
      **/
-    private $raw = null;
+    private $raw = NULL;
 
     /**
      * Constructs client instance
@@ -78,7 +78,7 @@ 
             return $data;
         } else {
             $this->logger->warning('No data found for given VIAF URL');
-            return false;
+            return FALSE;
         }
     }
 
@@ -94,7 +94,7 @@ 
             return (string) $this->raw->xpath('./ns1:nationalityOfEntity/ns1:data/ns1:text')[0];
         } else {
             $this->logger->warning('No address found for given VIAF URL');
-            return false;
+            return FALSE;
         }
     }
 
@@ -113,7 +113,7 @@ 
             return $name;
         } else {
             $this->logger->warning('No name found for given VIAF URL');
-            return false;
+            return FALSE;
         }
     }
 
@@ -125,7 +125,7 @@ 
     protected function getRaw()
     {
         $data = $this->client->getData();
-        if (!isset($this->raw) && $data != false) {
+        if (!isset($this->raw) && $data != FALSE) {
             $this->raw = Helper::getXmlFileAsString($data);
             $this->raw->registerXPathNamespace('ns1', 'http://viaf.org/viaf/terms#');
         }