From e4307fedacab82b2a60bc42f210eab0b3631f60a Mon Sep 17 00:00:00 2001 From: alphayax Date: Fri, 24 Jun 2016 21:41:17 +0200 Subject: [PATCH] Move Model namespace --- freebox/api/v3/models/AirMedia/AirMediaConfig.php | 2 +- freebox/api/v3/models/AirMedia/AirMediaReceiver.php | 2 +- freebox/api/v3/models/AirMedia/AirMediaReceiverRequest.php | 2 +- freebox/api/v3/models/Call/CallEntry.php | 2 +- freebox/api/v3/models/Call/ContactAddress.php | 4 ++-- freebox/api/v3/models/Call/ContactEmail.php | 2 +- freebox/api/v3/models/Call/ContactEntry.php | 2 +- freebox/api/v3/models/Call/ContactNumber.php | 2 +- freebox/api/v3/models/Call/ContactUrl.php | 2 +- freebox/api/v3/models/Connection/Config.php | 4 ++-- freebox/api/v3/models/Connection/DynDns/Config.php | 2 +- freebox/api/v3/models/Connection/DynDns/Status.php | 2 +- freebox/api/v3/models/Connection/Ftth/Status.php | 2 +- freebox/api/v3/models/Connection/Ipv6/Configuration.php | 4 ++-- freebox/api/v3/models/Connection/Ipv6/Delegation.php | 2 +- freebox/api/v3/models/Connection/Status.php | 2 +- freebox/api/v3/models/Connection/Xdsl/XdslInfos.php | 2 +- freebox/api/v3/models/Connection/Xdsl/XdslStats.php | 2 +- freebox/api/v3/models/Connection/Xdsl/XdslStatus.php | 2 +- freebox/api/v3/models/DhcpConfig.php | 2 +- freebox/api/v3/models/Download/BlackListEntry.php | 2 +- freebox/api/v3/models/Download/Config/DlBlockListConfig.php | 2 +- freebox/api/v3/models/Download/Config/DlBtConfig.php | 2 +- freebox/api/v3/models/Download/Config/DlFeedConfig.php | 2 +- freebox/api/v3/models/Download/Config/DlNewsConfig.php | 2 +- freebox/api/v3/models/Download/Config/DlRate.php | 2 +- .../api/v3/models/Download/Config/DlThrottlingConfig.php | 2 +- freebox/api/v3/models/Download/Config/DownloadConfig.php | 2 +- freebox/api/v3/models/Download/Feed/DownloadFeed.php | 2 +- freebox/api/v3/models/Download/Feed/DownloadFeedItem.php | 2 +- freebox/api/v3/models/Download/File.php | 2 +- freebox/api/v3/models/Download/Peer.php | 2 +- freebox/api/v3/models/Download/Stats/DhtStats.php | 2 +- freebox/api/v3/models/Download/Stats/DownloadStats.php | 2 +- freebox/api/v3/models/Download/Stats/NzbConfigStatus.php | 2 +- freebox/api/v3/models/Download/Task.php | 2 +- freebox/api/v3/models/Download/Tracker.php | 2 +- freebox/api/v3/models/FileSystem/FileInfo.php | 2 +- freebox/api/v3/models/FileSystem/FileUpload.php | 4 ++-- freebox/api/v3/models/FileSystem/FsTask.php | 2 +- freebox/api/v3/models/FileSystem/ShareLink.php | 4 ++-- freebox/api/v3/models/Freeplug/Freeplug.php | 2 +- freebox/api/v3/models/Freeplug/FreeplugNetwork.php | 4 ++-- freebox/api/v3/models/FtpConfig.php | 2 +- freebox/api/v3/models/LAN/LanConfig.php | 2 +- freebox/api/v3/models/LAN/LanHost.php | 2 +- freebox/api/v3/models/LAN/LanHostL2Ident.php | 2 +- freebox/api/v3/models/LAN/LanHostL3Connectivity.php | 2 +- freebox/api/v3/models/LAN/LanHostName.php | 2 +- freebox/api/v3/models/LAN/LanInterface.php | 2 +- freebox/api/v3/models/LCDConfig.php | 4 ++-- freebox/api/v3/models/NAT/DmzConfig.php | 2 +- freebox/api/v3/models/NAT/IncomingPortConfig.php | 2 +- freebox/api/v3/models/NAT/PortForwardingConfig.php | 2 +- freebox/api/v3/models/NetworkShare/AfpConfig.php | 2 +- freebox/api/v3/models/NetworkShare/SambaConfig.php | 2 +- freebox/api/v3/models/ParentalControl/Filter.php | 2 +- freebox/api/v3/models/ParentalControl/FilterConfig.php | 2 +- freebox/api/v3/models/ParentalControl/FilterPlanning.php | 2 +- freebox/api/v3/models/Storage/DiskPartition.php | 2 +- freebox/api/v3/models/Storage/OperationProgress.php | 2 +- freebox/api/v3/models/Storage/StorageDisk.php | 2 +- freebox/api/v3/models/SwitchPort/Config.php | 2 +- freebox/api/v3/models/SwitchPort/Stats.php | 2 +- freebox/api/v3/models/SwitchPort/Status.php | 2 +- freebox/api/v3/models/SystemConfig.php | 4 ++-- freebox/api/v3/models/UPnP/UpnpAvConfig.php | 2 +- freebox/api/v3/models/UPnP/UpnpIgdConfig.php | 2 +- freebox/api/v3/models/UPnP/UpnpIgdRedirection.php | 2 +- freebox/api/v3/models/VPN/Client/Config/ClientConfig.php | 2 +- freebox/api/v3/models/VPN/Client/Config/PPTPConfig.php | 2 +- freebox/api/v3/models/VPN/Client/IpInfo.php | 2 +- freebox/api/v3/models/VPN/Client/Stats.php | 2 +- freebox/api/v3/models/VPN/Client/Status.php | 2 +- freebox/api/v3/models/VPN/Server/Config/OpenVPNConfig.php | 2 +- freebox/api/v3/models/VPN/Server/Config/PPTPConfig.php | 2 +- freebox/api/v3/models/VPN/Server/Config/ServerConfig.php | 2 +- freebox/api/v3/models/VPN/Server/Connection.php | 2 +- freebox/api/v3/models/VPN/Server/Server.php | 2 +- freebox/api/v3/models/VPN/Server/User.php | 2 +- freebox/api/v3/models/WiFi/APStation/Flags.php | 2 +- freebox/api/v3/models/WiFi/APStation/Station.php | 2 +- freebox/api/v3/models/WiFi/AccessPoint/AP.php | 4 ++-- freebox/api/v3/models/WiFi/AccessPoint/APCapabilities.php | 2 +- freebox/api/v3/models/WiFi/AccessPoint/APConfig.php | 2 +- freebox/api/v3/models/WiFi/AccessPoint/APHtConfig.php | 2 +- freebox/api/v3/models/WiFi/AccessPoint/APStatus.php | 2 +- freebox/api/v3/models/WiFi/AccessPoint/AllowedComb.php | 2 +- freebox/api/v3/models/WiFi/Bss/Bss.php | 2 +- freebox/api/v3/models/WiFi/Bss/Config.php | 2 +- freebox/api/v3/models/WiFi/Bss/Status.php | 2 +- freebox/api/v3/models/WiFi/GlobalConfig.php | 2 +- freebox/api/v3/models/WiFi/MacFilter.php | 2 +- freebox/api/v3/models/WiFi/Planning.php | 2 +- freebox/api/v3/models/WiFi/Radar/ChannelUsage.php | 2 +- freebox/api/v3/models/WiFi/Radar/Neighbor.php | 2 +- freebox/api/v3/models/WiFi/Radar/NeighborCap.php | 2 +- freebox/{api/v3 => utils}/Model.php | 4 ++-- freebox/utils/rest/Rest.php | 6 +++--- tests/Test.php | 2 +- 100 files changed, 112 insertions(+), 112 deletions(-) rename freebox/{api/v3 => utils}/Model.php (98%) diff --git a/freebox/api/v3/models/AirMedia/AirMediaConfig.php b/freebox/api/v3/models/AirMedia/AirMediaConfig.php index b3d3553..2ed9a67 100644 --- a/freebox/api/v3/models/AirMedia/AirMediaConfig.php +++ b/freebox/api/v3/models/AirMedia/AirMediaConfig.php @@ -1,6 +1,6 @@ country = $country; } -} \ No newline at end of file +} diff --git a/freebox/api/v3/models/Call/ContactEmail.php b/freebox/api/v3/models/Call/ContactEmail.php index 4493df3..07e98b2 100644 --- a/freebox/api/v3/models/Call/ContactEmail.php +++ b/freebox/api/v3/models/Call/ContactEmail.php @@ -1,6 +1,6 @@ allow_token_request = $allow_token_request; } -} \ No newline at end of file +} diff --git a/freebox/api/v3/models/Connection/DynDns/Config.php b/freebox/api/v3/models/Connection/DynDns/Config.php index 57cb943..a6b72f9 100644 --- a/freebox/api/v3/models/Connection/DynDns/Config.php +++ b/freebox/api/v3/models/Connection/DynDns/Config.php @@ -1,6 +1,6 @@ delegations = $delegations; } -} \ No newline at end of file +} diff --git a/freebox/api/v3/models/Connection/Ipv6/Delegation.php b/freebox/api/v3/models/Connection/Ipv6/Delegation.php index 35874da..49e305c 100644 --- a/freebox/api/v3/models/Connection/Ipv6/Delegation.php +++ b/freebox/api/v3/models/Connection/Ipv6/Delegation.php @@ -1,6 +1,6 @@ fullurl; } -} \ No newline at end of file +} diff --git a/freebox/api/v3/models/Freeplug/Freeplug.php b/freebox/api/v3/models/Freeplug/Freeplug.php index e7a89d8..69ac3f9 100644 --- a/freebox/api/v3/models/Freeplug/Freeplug.php +++ b/freebox/api/v3/models/Freeplug/Freeplug.php @@ -1,6 +1,6 @@ members; } -} \ No newline at end of file +} diff --git a/freebox/api/v3/models/FtpConfig.php b/freebox/api/v3/models/FtpConfig.php index cd25499..0aaf219 100644 --- a/freebox/api/v3/models/FtpConfig.php +++ b/freebox/api/v3/models/FtpConfig.php @@ -1,6 +1,6 @@ box_authenticated; } -} \ No newline at end of file +} diff --git a/freebox/api/v3/models/UPnP/UpnpAvConfig.php b/freebox/api/v3/models/UPnP/UpnpAvConfig.php index 42d3897..3a5d000 100644 --- a/freebox/api/v3/models/UPnP/UpnpAvConfig.php +++ b/freebox/api/v3/models/UPnP/UpnpAvConfig.php @@ -1,6 +1,6 @@ capabilites; + return $this->capabilities; } /** diff --git a/freebox/api/v3/models/WiFi/AccessPoint/APCapabilities.php b/freebox/api/v3/models/WiFi/AccessPoint/APCapabilities.php index 5cd8c71..e55beb0 100644 --- a/freebox/api/v3/models/WiFi/AccessPoint/APCapabilities.php +++ b/freebox/api/v3/models/WiFi/AccessPoint/APCapabilities.php @@ -1,6 +1,6 @@ toArray(); } -} \ No newline at end of file +} diff --git a/freebox/utils/rest/Rest.php b/freebox/utils/rest/Rest.php index 0e5e346..0ca26fa 100644 --- a/freebox/utils/rest/Rest.php +++ b/freebox/utils/rest/Rest.php @@ -80,7 +80,7 @@ class Rest extends alphayax\utils\Rest { $Model_xs = @$this->getCurlResponse()['result'] ?: []; /// Cast elements - if( ! empty( $className) && ! empty( $Model_xs) && is_subclass_of( $className, alphayax\freebox\api\v3\Model::class)) { + if( ! empty( $className) && ! empty( $Model_xs) && is_subclass_of( $className, alphayax\freebox\utils\Model::class)) { array_walk( $Model_xs, function( &$item, $key, $className){ $item = new $className( $item); }, $className); @@ -91,13 +91,13 @@ class Rest extends alphayax\utils\Rest { /** * @param string $className - * @return array|alphayax\freebox\api\v3\Model + * @return array|\alphayax\freebox\utils\Model */ public function getResult( $className = ''){ $Model = @$this->getCurlResponse()['result']; /// Cast element - if( ! empty( $className) && ! empty( $Model) && is_subclass_of( $className, alphayax\freebox\api\v3\Model::class) && is_array( $Model)){ + if( ! empty( $className) && ! empty( $Model) && is_subclass_of( $className, alphayax\freebox\utils\Model::class) && is_array( $Model)){ return new $className( $Model); } diff --git a/tests/Test.php b/tests/Test.php index 2d81eb0..b966cac 100644 --- a/tests/Test.php +++ b/tests/Test.php @@ -1,6 +1,6 @@