Merge branch 'release/v1'

* release/v1:
  PSR-2 optimization
  Tests improved
  - Node and WebHook objects - Push/WebHook becomes Object/Event - WebHooks collection type created
  Node object created
  key attribute becomes static in BaseObject (was CrudObject)
  BaseObject created
  duplicated CheckFields::URL key removed from Check::$typeCheck

Author: biscolab

src/Abstracts/AbstractCollection.php

@@ -82,9 +82,10 @@ public function addItem($item)
     protected function parseItem($item)
     {
 
-        if($this->children_class && !$item instanceof $this->children_class) {
+        if ($this->children_class && !$item instanceof $this->children_class) {
             $item = new $this->children_class($item);
         }
+
         return $item;
     }
 

src/Enum/UpDownFieldType.php

@@ -25,26 +25,26 @@ class UpDownFieldType
     /**
      * @var string
      */
-    const INT    = 'int';
+    const INT = 'int';
 
     /**
      * @var string
      */
-    const FLOAT  = 'float';
+    const FLOAT = 'float';
 
     /**
      * @var string
      */
-    const ARRAY  = 'array';
+    const ARRAY = 'array';
 
     /**
      * @var string
      */
-    const BOOL  = 'bool';
+    const BOOL = 'bool';
 
     /**
      * @var string
      */
-    const DATETIME  = 'datetime';
+    const DATETIME = 'datetime';
 
 }

src/Fields/CheckFields.php

@@ -17,47 +17,46 @@
 class CheckFields
 {
 
-    const TOKEN = 'token';
+    const TOKEN              = 'token';
 
-    const URL = 'url';
+    const URL                = 'url';
 
-    const PERIOD = 'period';
+    const PERIOD             = 'period';
 
-    const APDEX_T = 'apdex_t';
+    const APDEX_T            = 'apdex_t';
 
-    const ENABLED = 'enabled';
+    const ENABLED            = 'enabled';
 
-    const PUBLISHED = 'published';
+    const PUBLISHED          = 'published';
 
-    const ALIAS = 'alias';
+    const ALIAS              = 'alias';
 
-    const STRING_MATCH = 'string_match';
+    const STRING_MATCH       = 'string_match';
 
-    const MUTE_UNTIL = 'mute_until';
+    const MUTE_UNTIL         = 'mute_until';
 
-    const HTTP_VERB = 'http_verb';
+    const HTTP_VERB          = 'http_verb';
 
-    const HTTP_BODY = 'http_body';
+    const HTTP_BODY          = 'http_body';
 
     const DISABLED_LOCATIONS = 'disabled_locations';
 
-    const CUSTOM_HEADERS = 'custom_headers';
+    const CUSTOM_HEADERS     = 'custom_headers';
 
-    const DOWN = 'down';
+    const DOWN               = 'down';
 
-    const DOWN_SINCE = 'down_since';
+    const DOWN_SINCE         = 'down_since';
 
-    const LAST_STATUS = 'last_status';
+    const LAST_STATUS        = 'last_status';
 
-    const ERROR = 'error';
+    const ERROR              = 'error';
 
-    const LAST_CHECK_AT = 'last_check_at';
+    const LAST_CHECK_AT      = 'last_check_at';
 
-    const NEXT_CHECK_AT = 'next_check_at';
+    const NEXT_CHECK_AT      = 'next_check_at';
 
-    const FAVICON_URL = 'favicon_url';
-
-    const SSL = 'ssl';
+    const FAVICON_URL        = 'favicon_url';
 
+    const SSL                = 'ssl';
 
 }

src/Fields/EventFields.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright (c) 2019 - present
+ * updown - EventFieldshp
+ * author: Roberto Belotti - [email protected]
+ * web : robertobelotti.com, github.com/biscolab
+ * Initial version created on: 15/2/2019
+ * MIT license: https://github.com/biscolab/updown-php/blob/master/LICENSE
+ */
+
+namespace Biscolab\UpDown\Fields;
+
+/**
+ * Class EventFields
+ * @package Biscolab\UpDown\Fields
+ */
+class EventFields
+{
+
+    /**
+     * @var string
+     */
+    const EVENT = 'event';
+
+    /**
+     * @var string
+     */
+    const CHECK = 'check';
+
+    /**
+     * @var string
+     */
+    const DOWNTIME = 'downtime';
+}

src/Fields/NodeFields.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright (c) 2019 - present
+ * updown - NodeFields.php
+ * author: Roberto Belotti - [email protected]
+ * web : robertobelotti.com, github.com/biscolab
+ * Initial version created on: 18/2/2019
+ * MIT license: https://github.com/biscolab/updown-php/blob/master/LICENSE
+ */
+
+namespace Biscolab\UpDown\Fields;
+
+/**
+ * Class NodeFields
+ * @package Biscolab\UpDown\Fields
+ */
+class NodeFields
+{
+
+    const NAME         = 'name';
+
+    const IP           = 'ip';
+
+    const IP6          = 'ip6';
+
+    const CITY         = 'city';
+
+    const COUNTRY      = 'country';
+
+    const COUNTRY_CODE = 'country_code';
+
+    const LAT          = 'lat';
+
+    const LNG          = 'lng';
+
+}

src/Fields/WebHookFields.php

@@ -4,14 +4,14 @@
  * updown - WebHookFields.php
  * author: Roberto Belotti - [email protected]
  * web : robertobelotti.com, github.com/biscolab
- * Initial version created on: 15/2/2019
+ * Initial version created on: 18/2/2019
  * MIT license: https://github.com/biscolab/updown-php/blob/master/LICENSE
  */
 
 namespace Biscolab\UpDown\Fields;
 
 /**
- * Class WebHookFields
+ * Class EventFields
  * @package Biscolab\UpDown\Fields
  */
 class WebHookFields
@@ -20,15 +20,10 @@ class WebHookFields
     /**
      * @var string
      */
-    const EVENT = 'event';
+    const ID = 'id';
 
     /**
      * @var string
      */
-    const CHECK = 'check';
-
-    /**
-     * @var string
-     */
-    const DOWNTIME = 'downtime';
+    const URL = 'url';
 }

src/Http/UpDownResponse.php

@@ -109,6 +109,25 @@ public function toArray(string $json_response): array
         return $this->array_response;
     }
 
+    /**
+     * @param array|null $array_response
+     *
+     * @throws ResponseException
+     */
+    protected function detectError(?array $array_response = null)
+    {
+
+        if (is_null($array_response)) {
+            throw new ResponseException('Missing "results" in UpDownApi Response');
+        }
+
+        if (!empty($array_response['error'])) {
+            $this->setErrorMessage($array_response['error']);
+            throw new ResponseException($array_response['error']);
+        }
+
+    }
+
     /**
      * Check HTTP status code (silent/No exceptions!)
      * @return int
@@ -196,23 +215,4 @@ public function getHttpStatusCode(): int
         return intval($this->http_status_code);
     }
 
-    /**
-     * @param array|null $array_response
-     *
-     * @throws ResponseException
-     */
-    protected function detectError(?array $array_response = null)
-    {
-
-        if (is_null($array_response)) {
-            throw new ResponseException('Missing "results" in UpDownApi Response');
-        }
-
-        if (!empty($array_response['error'])) {
-            $this->setErrorMessage($array_response['error']);
-            throw new ResponseException($array_response['error']);
-        }
-
-    }
-
 }

src/Http/UpDownResult.php

@@ -36,7 +36,9 @@ public function __construct(array $data = [])
     /**
      * @return array
      */
-    public function getData(): array {
+    public function getData(): array
+    {
+
         return $this->data;
     }
 }