Merge pull request #26 from CottaCush/features/setup-travis-build

[improvements/setup-travis-build]: Setup CI for repository
CottaCush · Jul 9, 2019 · a93eead · a93eead
2 parents f8edc85 + 5b16fed
commit a93eead
Show file tree

Hide file tree

Showing 35 changed files with 508 additions and 61 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,32 @@
+language: php
+
+php:
+  - 7.0
+  - 7.1
+  - 7.2
+
+# This triggers builds to run on the new TravisCI infrastructure.
+# See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/
+sudo: false
+
+## Cache composer
+cache:
+  directories:
+    - vendor
+    - $HOME/.composer/cache
+    - $HOME/cphalcon
+
+before_script:
+  - travis_retry composer self-update
+  - travis_retry composer config --global github-oauth.github.com "$GITHUB_TOKEN"
+  - export PATH="$HOME/.composer/vendor/bin:$PATH"
+  - travis_retry composer install --no-interaction --ignore-platform-reqs
+  - travis_retry vendor/bin/install-phalcon.sh $PHALCON_VERSION
+  - travis_retry composer require --dev php-coveralls/php-coveralls:~2.0 --ignore-platform-reqs
+
+script:
+  - vendor/bin/phpcs --standard=psr2 src/
+  - vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml
+
+after_success:
+  - sh -c 'php vendor/bin/php-coveralls -v'
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -0,0 +1,7 @@
+# Contributors
+
+
+- [Kehinde Ladipo][link-kehinde]
+
+
+[link-kehinde]: https://github.com/kenny-wealth
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 [![Latest Version on Packagist][ico-version]][link-packagist]
 [![Software License][ico-license]](LICENSE.md)
+[![Build Status][ico-travis]][link-travis]
+[![Coverage Status][ico-coveralls]][link-coveralls]
 [![Total Downloads][ico-downloads]][link-downloads]
 
 Phalcon Utils is a repository for libraries that are used across different phalcon projects.
@@ -55,14 +57,12 @@ The MIT License (MIT). Please see [License File](LICENSE.md) for more informatio
 [ico-version]: https://img.shields.io/packagist/v/cottacush/phalcon-utils.svg?style=flat-square
 [ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square
 [ico-travis]: https://img.shields.io/travis/cottacush/phalcon-utils/master.svg?style=flat-square
-[ico-scrutinizer]: https://img.shields.io/scrutinizer/coverage/g/cottacush/phalcon-utils.svg?style=flat-square
-[ico-code-quality]: https://img.shields.io/scrutinizer/g/cottacush/phalcon-utils.svg?style=flat-square
+[ico-coveralls]: https://coveralls.io/repos/github/CottaCush/phalcon-utils/badge.svg?branch=master
 [ico-downloads]: https://img.shields.io/packagist/dt/cottacush/phalcon-utils.svg?style=flat-square
 
 [link-packagist]: https://packagist.org/packages/cottacush/phalcon-utils
-[link-travis]: https://travis-ci.org/cottacush/phalcon-utils
-[link-scrutinizer]: https://scrutinizer-ci.com/g/cottacush/phalcon-utils/code-structure
-[link-code-quality]: https://scrutinizer-ci.com/g/cottacush/phalcon-utils
+[link-travis]: https://travis-ci.org/CottaCush/phalcon-utils
+[link-coveralls]: https://coveralls.io/github/CottaCush/phalcon-utils?branch=master
 [link-downloads]: https://packagist.org/packages/cottacush/phalcon-utils
 [link-author]: https://github.com/yemexx1
-[link-contributors]: ../../contributors
+[link-contributors]: CONTRIBUTORS.md
diff --git a/composer.json b/composer.json
@@ -46,7 +46,10 @@
     "pagerfanta/pagerfanta": "^1.0",
     "bshaffer/oauth2-server-php": "^1.8",
     "league/fractal": "^0.13.0",
-    "xamin/handlebars.php": "^0.10.4"
+    "xamin/handlebars.php": "^0.10.4",
+    "techpivot/phalcon-ci-installer": "~1.0",
+    "scrutinizer/ocular": "~1.1",
+    "squizlabs/php_codesniffer": "~2.3"
   },
   "suggest": {
     "redound/phalcon-rest": "Install Phalcon Rest for REST app bootstrap support",

diff --git a/phpunit.xml b/phpunit.xml
@@ -16,7 +16,11 @@
     </testsuites>
     <filter>
         <whitelist>
-            <directory suffix=".php">src/</directory>
+            <directory suffix=".php">src/Templating/</directory>
+            <directory suffix=".php">src/Util/</directory>
+            <directory suffix=".php">src/Validation/</directory>
+            <directory suffix=".php">src/Templating/</directory>
+
         </whitelist>
     </filter>
     <logging>
@@ -26,4 +30,4 @@
         <log type="coverage-text" target="build/coverage.txt"/>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>
-</phpunit>
+</phpunit>
diff --git a/src/Bootstrap/Bootstrap.php b/src/Bootstrap/Bootstrap.php
@@ -9,16 +9,16 @@
  */
 class Bootstrap
 {
-    protected $_executables;
+    protected $executables;
 
     public function __construct(...$executables)
     {
-        $this->_executables = $executables;
+        $this->executables = $executables;
     }
 
     public function run(...$args)
     {
-        foreach ($this->_executables as $executable) {
+        foreach ($this->executables as $executable) {
             call_user_func_array([$executable, 'run'], $args);
         }
     }

diff --git a/src/Constants/HttpStatusCodes.php b/src/Constants/HttpStatusCodes.php
@@ -109,6 +109,7 @@ class HttpStatusCodes
     const INTERNAL_SERVER_ERROR_CODE = 500;
     const OK_CODE = 200;
     const NOT_FOUND_CODE = 404;
+    const RESOURCE_CREATED_CODE = 201;
 
 
     /**
@@ -120,5 +121,4 @@ public static function getMessage($code)
     {
         return constant('self::HTTP_' . $code);
     }
-
 }
diff --git a/src/Controller/FractalController.php b/src/Controller/FractalController.php
@@ -70,8 +70,7 @@ protected function createCollectionResponse(
         $modelsToLoad,
         $resourceKey = null,
         $meta = null
-    )
-    {
+    ) {
         if ($modelsToLoad instanceof Transformable) {
             $modelsToLoad = $modelsToLoad->getModelsToLoad();
         }

diff --git a/src/Exceptions/ValidatorException.php b/src/Exceptions/ValidatorException.php
@@ -2,7 +2,6 @@
 
 namespace PhalconUtils\Exceptions;
 
-
 use Phalcon\Exception;
 
 /**
@@ -13,4 +12,4 @@
 class ValidatorException extends Exception
 {
 
-}
+}
diff --git a/src/Mailer/MailerHandler.php b/src/Mailer/MailerHandler.php
@@ -49,8 +49,16 @@ public function __construct($username, $password, $smtp_host, $smtp_port, $defau
      * @return bool
      * @author Adeyemi Olaoye <yemi@cottacush.com>
      */
-    public function send($text = "", $html = "", $subject = "", $to = [], $from = null, $cc = [], $bcc = [], $params = [])
-    {
+    public function send(
+        $text = "",
+        $html = "",
+        $subject = "",
+        $to = [],
+        $from = null,
+        $cc = [],
+        $bcc = [],
+        $params = []
+    ) {
         $this->failures = [];
 
         if (is_null($from)) {
@@ -84,5 +92,4 @@ private static function getActualMessage($message, $params)
         }
         return $message;
     }
-
-}
+}
diff --git a/src/Middleware/RequestLoggerMiddleware.php b/src/Middleware/RequestLoggerMiddleware.php
@@ -27,7 +27,6 @@ public function __construct($logTargets = [])
         }
 
         $this->logger = new Logger($logTargets);
-
     }
 
     public function beforeExecuteRoute()

diff --git a/src/Model/BaseModel.php b/src/Model/BaseModel.php
@@ -231,8 +231,7 @@ public static function getPaginatedData(
         TransformerAbstract $transformer = null,
         $shouldPaginate = null,
         $resourceKey = null
-    )
-    {
+    ) {
         $shouldPaginate = is_null($shouldPaginate) ? self::shouldPaginate() : $shouldPaginate;
         $paginator = null;
 

diff --git a/src/Pagination/PaginationAdapter.php b/src/Pagination/PaginationAdapter.php
@@ -50,4 +50,4 @@ public function getSlice($offset, $length)
     {
         return $this->paginateObject->items;
     }
-}
+}
diff --git a/src/Pagination/PaginationQueryBuilder.php b/src/Pagination/PaginationQueryBuilder.php
@@ -26,4 +26,4 @@ public function getPaginate()
 
         return $paginate;
     }
-}
+}
diff --git a/src/S3/S3Client.php b/src/S3/S3Client.php
@@ -27,8 +27,14 @@ class S3Client
      * @param null $bucket
      * @param null $namespace
      */
-    public function __construct($awsKey, $awsSecret, $region, $bucket = null, $namespace = null, $version = '2006-03-01')
-    {
+    public function __construct(
+        $awsKey,
+        $awsSecret,
+        $region,
+        $bucket = null,
+        $namespace = null,
+        $version = '2006-03-01'
+    ) {
         $this->awsKey = $awsKey;
         $this->awsSecret = $awsSecret;
         $this->bucket = $bucket;
@@ -93,13 +99,13 @@ public function createObject($local_file_path, $file_name, $bucket = null, $name
         if (is_null($bucket) && is_null($this->bucket)) {
             $this->addMessage('Invalid bucket');
             return false;
-        } else if (!is_null($this->bucket)) {
+        } elseif (!is_null($this->bucket)) {
             $bucket = $this->bucket;
         }
 
         if (is_null($namespace) && is_null($this->namespace)) {
             $namespace = '';
-        } else if (!is_null($this->namespace)) {
+        } elseif (!is_null($this->namespace)) {
             $namespace = $this->namespace;
         }
 
@@ -139,5 +145,4 @@ public function addMessage($message)
     {
         $this->error_messages[] = $message;
     }
-
-}
+}
diff --git a/src/Validation/BaseValidation.php b/src/Validation/BaseValidation.php
@@ -58,8 +58,7 @@ private function getSentenceFromArray(
         $twoWordsConnector = ' and ',
         $lastWordConnector = null,
         $connector = ', '
-    )
-    {
+    ) {
         if ($lastWordConnector === null) {
             $lastWordConnector = $twoWordsConnector;
         }

diff --git a/src/Validation/RequestValidation.php b/src/Validation/RequestValidation.php
@@ -15,8 +15,8 @@ class RequestValidation extends BaseValidation
      * @author Adeyemi Olaoye <yemi@cottacush.com>
      * @return mixed
      */
-    function initialize()
+    public function initialize()
     {
         // TODO: Implement initialize() method.
     }
-}
+}
diff --git a/src/Validation/Validators/IMEINumber.php b/src/Validation/Validators/IMEINumber.php
@@ -52,7 +52,9 @@ private function validateImei($imei)
             }
             $sum += $num;
         }
-        if ((($sum + $imei[14]) % 10) != 0) return false;
+        if ((($sum + $imei[14]) % 10) != 0) {
+            return false;
+        }
         return true;
     }
-}
+}
diff --git a/src/Validation/Validators/NigerianPhoneNumber.php b/src/Validation/Validators/NigerianPhoneNumber.php
@@ -24,7 +24,8 @@ public function validate(Validation $validation, $attribute)
     {
         $includeCountryCode = $this->getOption('must_include_country_code', false);
         $includePlus = $this->getOption('must_include_plus', false);
-        $pattern = '/^' . '[+]' . (($includePlus) ? '' : '?') . (($includeCountryCode) ? '234[0]?' : '((234[0]?)|0)') . '[\d]{10}$/';
+        $pattern = '/^' . '[+]' . (($includePlus) ? '' : '?') . (($includeCountryCode) ?
+                '234[0]?' : '((234[0]?)|0)') . '[\d]{10}$/';
         $this->setOption('pattern', $pattern);
 
         if (!preg_match($pattern, $validation->getValue($attribute))) {
@@ -34,4 +35,4 @@ public function validate(Validation $validation, $attribute)
             return true;
         }
     }
-}
+}
diff --git a/src/Validation/Validators/NotExisting.php b/src/Validation/Validators/NotExisting.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace PhalconUtils\Validation\Validators;
+
 use Phalcon\Validation;
 
 /**
@@ -27,4 +28,4 @@ public function validate(Validation $validation, $attribute)
         }
         return $is_valid;
     }
-}
+}