From 3c508686ca5693a0656eadfe74e958049e325d22 Mon Sep 17 00:00:00 2001
From: "Phyks (Lucas Verney)" <phyks@phyks.me>
Date: Fri, 17 Jun 2016 12:39:34 +0200
Subject: [PATCH] Fix for PSR0 compatibility

Not sure how relevant it is.
---
 .php_cs                                       |  1 -
 .../upnp/{upnpdevice.php => UPnPDevice.php}   | 30 +++++++++----------
 .../{upnpplaylist.php => UPnPPlaylist.php}    |  0
 modules/localplay/upnp/upnpplayer.class.php   |  4 +--
 4 files changed, 17 insertions(+), 18 deletions(-)
 rename modules/localplay/upnp/{upnpdevice.php => UPnPDevice.php} (89%)
 rename modules/localplay/upnp/{upnpplaylist.php => UPnPPlaylist.php} (100%)

diff --git a/.php_cs b/.php_cs
index c91f8f79..5e939703 100644
--- a/.php_cs
+++ b/.php_cs
@@ -15,7 +15,6 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
 
 return Symfony\CS\Config\Config::create()
     ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
-    ->fixers(array('-psr0'))
     ->finder($finder)
     ->setUsingCache(true)
 ;
diff --git a/modules/localplay/upnp/upnpdevice.php b/modules/localplay/upnp/UPnPDevice.php
similarity index 89%
rename from modules/localplay/upnp/upnpdevice.php
rename to modules/localplay/upnp/UPnPDevice.php
index 0279b5ca..74b55ee7 100644
--- a/modules/localplay/upnp/upnpdevice.php
+++ b/modules/localplay/upnp/UPnPDevice.php
@@ -22,11 +22,11 @@ class UPnPDevice
      */
     private function restoreDescriptionUrl($descriptionUrl)
     {
-        debug_event('upnpdevice', 'readDescriptionUrl: ' . $descriptionUrl, 5);
+        debug_event('UPnPDevice', 'readDescriptionUrl: ' . $descriptionUrl, 5);
         $this->_settings = json_decode(Session::read('upnp_dev_' . $descriptionUrl), true);
 
         if ($this->_settings['descriptionURL'] == $descriptionUrl) {
-            debug_event('upnpdevice', 'service Urls restored from session.', 5);
+            debug_event('UPnPDevice', 'service Urls restored from session.', 5);
             return true;
         }
         return false;
@@ -34,14 +34,14 @@ class UPnPDevice
 
     private function parseDescriptionUrl($descriptionUrl)
     {
-        debug_event('upnpdevice', 'parseDescriptionUrl: ' . $descriptionUrl, 5);
+        debug_event('UPnPDevice', 'parseDescriptionUrl: ' . $descriptionUrl, 5);
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $descriptionUrl);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         $response = curl_exec($ch);
         curl_close($ch);
-        //!!debug_event('upnpdevice', 'parseDescriptionUrl response: ' . $response, 5);
+        //!!debug_event('UPnPDevice', 'parseDescriptionUrl response: ' . $response, 5);
 
         $responseXML = simplexml_load_string($response);
         $services    = $responseXML->device->serviceList->service;
@@ -92,9 +92,9 @@ class UPnPDevice
             'Connection: close',
             'Content-Length: ' . mb_strlen($body),
         );
-        //debug_event('upnpdevice', 'sendRequestToDevice Met: ' . $method . ' | ' . $controlUrl, 5);
-        //debug_event('upnpdevice', 'sendRequestToDevice Body: ' . $body, 5);
-        //debug_event('upnpdevice', 'sendRequestToDevice Hdr: ' . print_r($header, true), 5);
+        //debug_event('UPnPDevice', 'sendRequestToDevice Met: ' . $method . ' | ' . $controlUrl, 5);
+        //debug_event('UPnPDevice', 'sendRequestToDevice Body: ' . $body, 5);
+        //debug_event('UPnPDevice', 'sendRequestToDevice Hdr: ' . print_r($header, true), 5);
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $controlUrl);
@@ -107,7 +107,7 @@ class UPnPDevice
 
         $response = curl_exec($ch);
         curl_close($ch);
-        //debug_event('upnpdevice', 'sendRequestToDevice response: ' . $response, 5);
+        //debug_event('UPnPDevice', 'sendRequestToDevice response: ' . $response, 5);
 
         $headers = array();
         $tmp     = explode("\r\n\r\n", $response);
@@ -124,14 +124,14 @@ class UPnPDevice
         /*
         $lastHeaders = $headers[count($headers) - 1];
         $responseCode = $this->getResponseCode($lastHeaders);
-        debug_event('upnpdevice', 'sendRequestToDevice responseCode: ' . $responseCode, 5);
+        debug_event('UPnPDevice', 'sendRequestToDevice responseCode: ' . $responseCode, 5);
         if ($responseCode == 500)
         {
-            debug_event('upnpdevice', 'sendRequestToDevice HTTP-Code 500 - Create error response', 5);
+            debug_event('UPnPDevice', 'sendRequestToDevice HTTP-Code 500 - Create error response', 5);
         }
         else 
         {
-            debug_event('upnpdevice', 'sendRequestToDevice HTTP-Code OK - Create response', 5);
+            debug_event('UPnPDevice', 'sendRequestToDevice HTTP-Code OK - Create response', 5);
         }
         */
         
@@ -189,7 +189,7 @@ class UPnPDevice
             'NT: upnp:event',
             'TIMEOUT: Second-180',
         );
-        debug_event('upnpdevice', 'Subscribe with: ' . print_r($header, true), 5);
+        debug_event('UPnPDevice', 'Subscribe with: ' . print_r($header, true), 5);
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $eventUrl);
@@ -201,7 +201,7 @@ class UPnPDevice
 
         $response = curl_exec($ch);
         curl_close( $ch );
-        debug_event('upnpdevice', 'Subscribe response: ' . $response, 5);
+        debug_event('UPnPDevice', 'Subscribe response: ' . $response, 5);
 
         $lines = explode("\r\n", trim($response));
         foreach($lines as $line) {
@@ -211,7 +211,7 @@ class UPnPDevice
 
             if ($key == 'SID')
             {
-                debug_event('upnpdevice', 'Subscribtion SID: ' . $value, 5);
+                debug_event('UPnPDevice', 'Subscribtion SID: ' . $value, 5);
                 return $value;
             }
         }
@@ -239,7 +239,7 @@ class UPnPDevice
             'SID: ' . $sid,
         );
 
-        debug_event('upnpdevice', 'Unsubscribe from SID: ' . $sid . ' with: ' . "\n" . print_r($header, true), 5);
+        debug_event('UPnPDevice', 'Unsubscribe from SID: ' . $sid . ' with: ' . "\n" . print_r($header, true), 5);
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $eventUrl);
diff --git a/modules/localplay/upnp/upnpplaylist.php b/modules/localplay/upnp/UPnPPlaylist.php
similarity index 100%
rename from modules/localplay/upnp/upnpplaylist.php
rename to modules/localplay/upnp/UPnPPlaylist.php
diff --git a/modules/localplay/upnp/upnpplayer.class.php b/modules/localplay/upnp/upnpplayer.class.php
index 102fc4ec..b58e9164 100644
--- a/modules/localplay/upnp/upnpplayer.class.php
+++ b/modules/localplay/upnp/upnpplayer.class.php
@@ -69,8 +69,8 @@ class UPnPPlayer
      */
     public function __construct($name = "noname", $description_url = "http://localhost")
     {
-        require_once AmpConfig::get('prefix') . '/modules/localplay/upnp/upnpdevice.php';
-        require_once AmpConfig::get('prefix') . '/modules/localplay/upnp/upnpplaylist.php';
+        require_once AmpConfig::get('prefix') . '/modules/localplay/upnp/UPnPDevice.php';
+        require_once AmpConfig::get('prefix') . '/modules/localplay/upnp/UPnPPlaylist.php';
 
         debug_event('upnpPlayer', 'constructor: ' . $name . ' | ' . $description_url, 5);
         $this->_description_url = $description_url;