Merge pull request #6 from sima-land/Fix-Object-class

Rename class Object to BaseObject

Author: EvgenyGavrilov

.travis.yml

@@ -1,10 +1,9 @@
 language: php
 
 php:
-  - 5.6
   - 7.0
   - 7.1
-  - hhvm
+  - 7.2
 
 sudo: false
 
@@ -20,4 +19,4 @@ script:
   - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover --verbose $PHPUNIT_FLAGS
 
 after_script:
-  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover; fi
+  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover; fi

src/AbstractList.php

@@ -15,7 +15,7 @@
  *
  * @property $getParams GET параметры запроса.
  */
-abstract class AbstractList extends Object implements \Iterator
+abstract class AbstractList extends BaseObject implements \Iterator
 {
     /**
      * Кол-во потоков.

src/Object.php src/BaseObject.phpsrc/Object.php renamed to src/BaseObject.php

@@ -9,7 +9,7 @@
 /**
  * Базовый класс.
  */
-class Object
+class BaseObject
 {
     /**
      * Наименование лога.

src/Parser/Json.php

@@ -2,12 +2,12 @@
 
 namespace SimaLand\API\Parser;
 
-use SimaLand\API\Object;
+use SimaLand\API\BaseObject;
 
 /**
  * Сохранение данных в json файл.
  */
-class Json extends Object implements StorageInterface
+class Json extends BaseObject implements StorageInterface
 {
     /**
      * Пулный путь до файла.

src/Parser/Parser.php

@@ -3,7 +3,7 @@
 namespace SimaLand\API\Parser;
 
 use SimaLand\API\AbstractList;
-use SimaLand\API\Object;
+use SimaLand\API\BaseObject;
 
 /**
  * Загрузка и сохранение всех записей сущностей.
@@ -25,7 +25,7 @@
  *
  * ```
  */
-class Parser extends Object
+class Parser extends BaseObject
 {
     /**
      * @var array

src/Rest/Client.php

@@ -5,14 +5,14 @@
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\RequestOptions;
 use GuzzleHttp\Psr7\Response;
-use SimaLand\API\Object;
+use SimaLand\API\BaseObject;
 
 /**
  * SimaLand клиент.
  *
  * @link https://www.sima-land.ru/api/v3/help/
  */
-class Client extends Object
+class Client extends BaseObject
 {
     /**
      * Базовый url API sima-land.ru.

src/Rest/Request.php

@@ -2,12 +2,12 @@
 
 namespace SimaLand\API\Rest;
 
-use SimaLand\API\Object;
+use SimaLand\API\BaseObject;
 
 /**
  * Класс запроса к API simaland.
  */
-class Request extends Object
+class Request extends BaseObject
 {
     /**
      * Наименование сущности.

tests/BaseCase.php

@@ -7,7 +7,7 @@
 use GuzzleHttp\Psr7\Response;
 use Monolog\Handler\NullHandler;
 use Monolog\Logger;
-use SimaLand\API\Object;
+use SimaLand\API\BaseObject;
 use SimaLand\API\Rest\Client;
 
 class BaseCase extends \PHPUnit_Framework_TestCase
@@ -23,7 +23,7 @@ class BaseCase extends \PHPUnit_Framework_TestCase
      */
     public function getLogger()
     {
-        $logger = new Logger(Object::LOGGER_NAME);
+        $logger = new Logger(BaseObject::LOGGER_NAME);
         $logger->pushHandler(new NullHandler());
         return $logger;
     }

tests/ObjectTest.php

@@ -4,22 +4,22 @@
 
 use Monolog\Handler\NullHandler;
 use Monolog\Logger;
-use SimaLand\API\Object;
+use SimaLand\API\BaseObject;
 use SimaLand\API\Tests\models\TestModel;
 
 class ObjectTest extends BaseCase
 {
     public function testGetSetLogger()
     {
-        $object = new Object();
+        $object = new BaseObject();
         $this->assertInstanceOf('\Psr\Log\LoggerInterface', $object->getLogger());
 
-        $logger = new Logger(Object::LOGGER_NAME);
+        $logger = new Logger(BaseObject::LOGGER_NAME);
         $logger->pushHandler(new NullHandler());
-        $object = new Object(['logger' => $logger]);
+        $object = new BaseObject(['logger' => $logger]);
         $this->assertInstanceOf('\Psr\Log\LoggerInterface', $object->getLogger());
 
-        $object = new Object();
+        $object = new BaseObject();
         $object->setLogger($logger);
         $this->assertInstanceOf('\Psr\Log\LoggerInterface', $object->getLogger());
     }

tests/models/TestModel.php

@@ -2,7 +2,7 @@
 
 namespace SimaLand\API\Tests\models;
 
-use SimaLand\API\Object;
+use SimaLand\API\BaseObject;
 
 /**
  * Class TestModel
@@ -11,7 +11,7 @@
  * @property $sid int
  * @property $name string
  */
-class TestModel extends Object
+class TestModel extends BaseObject
 {
     protected $sid;