From f23cff48b1cdf622fdddcef090a50bae74328cbd Mon Sep 17 00:00:00 2001
From: alphayax <alphayax@gmail.com>
Date: Wed, 3 Feb 2016 22:09:51 +0100
Subject: [PATCH] refractor services Add SystemConfig class

---
 freebox/api/v3/models/SystemConfig.php        | 44 +++++++++++++++++++
 freebox/api/v3/{ => services}/config/DHCP.php |  2 +-
 freebox/api/v3/{ => services}/config/FTP.php  |  2 +-
 .../api/v3/{ => services}/config/System.php   | 11 +++--
 .../api/v3/{ => services}/login/Authorize.php |  2 +-
 .../Login.php => services/login/Session.php}  |  4 +-
 freebox/utils/Application.php                 |  6 +--
 7 files changed, 59 insertions(+), 12 deletions(-)
 create mode 100644 freebox/api/v3/models/SystemConfig.php
 rename freebox/api/v3/{ => services}/config/DHCP.php (94%)
 rename freebox/api/v3/{ => services}/config/FTP.php (93%)
 rename freebox/api/v3/{ => services}/config/System.php (68%)
 rename freebox/api/v3/{ => services}/login/Authorize.php (98%)
 rename freebox/api/v3/{login/Login.php => services/login/Session.php} (94%)

diff --git a/freebox/api/v3/models/SystemConfig.php b/freebox/api/v3/models/SystemConfig.php
new file mode 100644
index 0000000..1deaa30
--- /dev/null
+++ b/freebox/api/v3/models/SystemConfig.php
@@ -0,0 +1,44 @@
+<?php
+namespace alphayax\freebox\api\v3\models;
+use alphayax\freebox\api\v3\Model;
+
+/**
+ * Class SystemConfig
+ * @package alphayax\freebox\api\v3\models
+ */
+class SystemConfig extends Model {
+
+    /** @var string (Read-only) freebox firmware version */
+    protected $firmware_version;
+
+    /** @var string (Read-only) freebox mac address */
+    protected $mac;
+
+    /** @var string (Read-only) freebox serial number */
+    protected $serial;
+
+    /** @var string (Read-only) readable freebox uptime */
+    protected $uptime;
+
+    /** @var int    (Read-only) freebox uptime (in seconds) */
+    protected $uptime_val;
+
+    /** @var string (Read-only) freebox hardware revision */
+    protected $board_name;
+
+    /** @var int    (Read-only) temp cpum (°C) */
+    protected $temp_cpum;
+
+    /** @var int    (Read-only) temp sw (°C) */
+    protected $temp_sw;
+
+    /** @var int    (Read-only) temp cpub (°C) */
+    protected $temp_cpub;
+
+    /** @var int    (Read-only) fan rpm */
+    protected $fan_rpm;
+
+    /** @var bool   (Read-only) is the box authenticated (“étape 6”) */
+    protected $box_authenticated;
+
+}
\ No newline at end of file
diff --git a/freebox/api/v3/config/DHCP.php b/freebox/api/v3/services/config/DHCP.php
similarity index 94%
rename from freebox/api/v3/config/DHCP.php
rename to freebox/api/v3/services/config/DHCP.php
index 461284b..8444b6a 100644
--- a/freebox/api/v3/config/DHCP.php
+++ b/freebox/api/v3/services/config/DHCP.php
@@ -1,5 +1,5 @@
 <?php
-namespace alphayax\freebox\api\v3\config;
+namespace alphayax\freebox\api\v3\services\config;
 use alphayax\freebox\api\v3\models\DhcpConfig;
 use alphayax\freebox\api\v3\Service;
 
diff --git a/freebox/api/v3/config/FTP.php b/freebox/api/v3/services/config/FTP.php
similarity index 93%
rename from freebox/api/v3/config/FTP.php
rename to freebox/api/v3/services/config/FTP.php
index 9c8fc67..03eaa32 100644
--- a/freebox/api/v3/config/FTP.php
+++ b/freebox/api/v3/services/config/FTP.php
@@ -1,5 +1,5 @@
 <?php
-namespace alphayax\freebox\api\v3\config;
+namespace alphayax\freebox\api\v3\services\config;
 use alphayax\freebox\api\v3\Service;
 
 
diff --git a/freebox/api/v3/config/System.php b/freebox/api/v3/services/config/System.php
similarity index 68%
rename from freebox/api/v3/config/System.php
rename to freebox/api/v3/services/config/System.php
index b1eabde..0ca3ddf 100644
--- a/freebox/api/v3/config/System.php
+++ b/freebox/api/v3/services/config/System.php
@@ -1,5 +1,6 @@
 <?php
-namespace alphayax\freebox\api\v3\config;
+namespace alphayax\freebox\api\v3\services\config;
+use alphayax\freebox\api\v3\models\SystemConfig;
 use alphayax\freebox\api\v3\Service;
 
 
@@ -14,22 +15,24 @@ class System extends Service {
     const API_SYSTEM_REBOOT = '/api/v3/system/reboot/';
 
     /**
+     * Get the current system info
      * @throws \Exception
      */
     public function getConfiguration(){
         $rest = $this->getAuthService( self::API_SYSTEM);
         $rest->GET();
 
-        return $rest->getCurlResponse();
+        return new SystemConfig( $rest->getCurlResponse()['result']);
     }
 
     /**
+     * Reboot the Freebox
      * @return array
      * @throws \Exception
      */
-    public function reboot( ){
+    public function reboot(){
         $rest = $this->getAuthService( self::API_SYSTEM_REBOOT);
-        $rest->POST( );
+        $rest->POST();
 
         return $rest->getCurlResponse();
     }
diff --git a/freebox/api/v3/login/Authorize.php b/freebox/api/v3/services/login/Authorize.php
similarity index 98%
rename from freebox/api/v3/login/Authorize.php
rename to freebox/api/v3/services/login/Authorize.php
index 6e59e57..a4a8a2d 100644
--- a/freebox/api/v3/login/Authorize.php
+++ b/freebox/api/v3/services/login/Authorize.php
@@ -1,5 +1,5 @@
 <?php
-namespace alphayax\freebox\api\v3\login;
+namespace alphayax\freebox\api\v3\services\login;
 use alphayax\freebox\api\v3\Service;
 use alphayax\freebox\utils\Application;
 use alphayax\utils\cli\IO;
diff --git a/freebox/api/v3/login/Login.php b/freebox/api/v3/services/login/Session.php
similarity index 94%
rename from freebox/api/v3/login/Login.php
rename to freebox/api/v3/services/login/Session.php
index 0dc233e..f170878 100644
--- a/freebox/api/v3/login/Login.php
+++ b/freebox/api/v3/services/login/Session.php
@@ -1,5 +1,5 @@
 <?php
-namespace alphayax\freebox\api\v3\login;
+namespace alphayax\freebox\api\v3\services\login;
 use alphayax\freebox\api\v3\Service;
 
 
@@ -8,7 +8,7 @@ use alphayax\freebox\api\v3\Service;
  * @package alphayax\freebox\api\v3
  * @author <alphayax@gmail.com>
  */
-class Login extends Service {
+class Session extends Service {
 
     /// APIs services
     const API_LOGIN             = '/api/v3/login/';
diff --git a/freebox/utils/Application.php b/freebox/utils/Application.php
index 49ae521..c4f04d1 100644
--- a/freebox/utils/Application.php
+++ b/freebox/utils/Application.php
@@ -1,6 +1,6 @@
 <?php
 namespace alphayax\freebox\utils;
-use alphayax\freebox\api;
+use alphayax\freebox\api\v3\services;
 
 /**
  * Class Application
@@ -39,7 +39,7 @@ class Application {
      * Ask authorization to the freebox and save the app token
      */
     public function authorize(){
-        new api\v3\login\Authorize( $this);
+        new services\login\Authorize( $this);
     }
 
     /**
@@ -47,7 +47,7 @@ class Application {
      * @throws \Exception
      */
     public function openSession(){
-        $Login = new api\v3\login\Login( $this);
+        $Login = new services\login\Session( $this);
         $Login->ask_login_status();
         $Login->create_session();