Merge branch 'master' of https://github.com/bluzphp/module-phones int…

…o develop � Conflicts: � .scrutinizer.yml � .travis.yml � LICENSE.md � README.md � application/modules/phones/views/grid.phtml � composer.json
bluzphp · Sep 1, 2021 · 3232489 · 3232489
2 parents 17dd1a2 + 7ac218c
commit 3232489
Show file tree

Hide file tree

Showing 18 changed files with 72 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,5 @@
 .DS_Store
 .idea
+vendor
+composer.lock
+composer.phar
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,29 +1,44 @@
+checks:
+  php:
+    code_rating: true
+    deprecated_code_usage: true
+    duplication: true
+    no_short_open_tag: true
 build:
+  cache:
+    directories:
+      - "vendor"
+      - "~/.composer"
   nodes:
     analysis:
       tests:
         override:
           - php-scrutinizer-run
-checks:
-  php:
-    psr2_switch_declaration: true
-    psr2_class_declaration: true
-    no_short_open_tag: true
-    deprecated_code_usage: true
-    code_rating: true
+  dependencies:
+    override:
+      - COMPOSER_ROOT_VERSION=dev-master
 filter:
-  excluded_paths: [bin, docs, docker, data, tests, vendor]
+  excluded_paths:
+    - "bin/"
+    - "data/"
+    - "docs/"
+    - "docker/"
+    - "public/"
+    - "tests/"
+  dependency_paths:
+    - "vendor/"
 tools:
+  external_code_coverage: false
   php_analyzer: true
   php_code_sniffer:
     config:
-      standard: PSR2
+      standard: PSR12
   php_cpd:
     enabled: true
-    excluded_dirs: [bin, docs, docker, data, tests, vendor]
+    excluded_dirs: [bin, data, docs, docker, public, tests, vendor]
   php_loc:
     enabled: true
-    excluded_dirs: [bin, docs, docker, data, tests, vendor]
+    excluded_dirs: [bin, data, docs, docker, public, tests, vendor]
   php_mess_detector: true
   php_pdepend: true
   sensiolabs_security_checker: true
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,11 @@
 language: php
 php:
-  - 7.1
-  - 7.2
   - 7.3
-  - master
+  - 7.4
+  - 8.0
 matrix:
   allow_failures:
-    - php: master
+    - php: 8.0
 env:
   - BLUZ_MODULE=phones
 before_install:
@@ -26,13 +25,20 @@ before_script:
   - php vendor/bin/bluzman db:seed:run
 script:
   # Check code style
-  - php vendor/bin/phpcs ./application --standard=PSR1,PSR2 --encoding=utf-8 --ignore=./application/_loader.php
+  - php vendor/bin/phpcs ./application --standard=PSR12 --encoding=utf-8 --ignore=./application/_loader.php
   # Run built-in web-server
-  - php vendor/bin/bluzman server:start --host 127.0.0.1 -b -e testing
+  - php vendor/bin/bluzman server:start --host 127.0.0.1 -b
   # Run CodeCeption tests
   - php vendor/bin/bluzman test module-$BLUZ_MODULE
 notifications:
   email: false
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/b84e6a583d6eea87d0eb
+      - https://webhooks.gitter.im/e/c4fa557829c5bd992271
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false
 branches:
   only:
   - master

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2012-2019 by Bluz PHP Team
+Copyright (c) by Bluz PHP Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,15 +1,17 @@
 # Module Users Profile for Bluz Skeleton
+
 ## Achievements
 
-[![Latest Stable Version](https://img.shields.io/packagist/v/bluzphp/module-media.svg?label=version&style=flat)](https://packagist.org/packages/bluzphp/module-media)
+[![Latest Stable Version](https://img.shields.io/packagist/v/bluzphp/module-phones.svg?label=version&style=flat)](https://packagist.org/packages/bluzphp/module-phones)
+
+[![Build Status](https://img.shields.io/travis/bluzphp/module-phones/master.svg?style=flat)](https://travis-ci.com/bluzphp/module-phones)
 
-[![Build Status](https://img.shields.io/travis/bluzphp/module-media/master.svg?style=flat)](https://travis-ci.org/bluzphp/module-media)
+[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/bluzphp/module-phones.svg?style=flat)](https://scrutinizer-ci.com/g/bluzphp/module-phones/)
 
-[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/bluzphp/module-media.svg?style=flat)](https://scrutinizer-ci.com/g/bluzphp/module-media/)
+[![Total Downloads](https://img.shields.io/packagist/dt/bluzphp/module-phones.svg?style=flat)](https://packagist.org/packages/bluzphp/module-phones)
 
-[![Total Downloads](https://img.shields.io/packagist/dt/bluzphp/module-media.svg?style=flat)](https://packagist.org/packages/bluzphp/module-media)
+[![License](https://img.shields.io/packagist/l/bluzphp/module-phones.svg?style=flat)](https://packagist.org/packages/bluzphp/module-phones)
 
-[![License](https://img.shields.io/packagist/l/bluzphp/module-media.svg?style=flat)](https://packagist.org/packages/bluzphp/module-media)
 
 ## Usage
 ### Install module

diff --git a/application/models/UsersPhones/Crud.php b/application/models/UsersPhones/Crud.php
@@ -1,7 +1,9 @@
 <?php
+
 /**
  * @namespace
  */
+
 namespace Application\UsersPhones;
 
 /**

diff --git a/application/models/UsersPhones/Grid.php b/application/models/UsersPhones/Grid.php
@@ -1,7 +1,9 @@
 <?php
+
 /**
  * @namespace
  */
+
 namespace Application\UsersPhones;
 
 use Bluz\Grid\Source\SelectSource;
@@ -25,7 +27,7 @@ class Grid extends \Bluz\Grid\Grid
      * @return void
      * @throws \Bluz\Grid\GridException
      */
-    public function init() : void
+    public function init(): void
     {
         // Current table as source of grid
         $adapter = new SelectSource();

diff --git a/application/models/UsersPhones/Row.php b/application/models/UsersPhones/Row.php
@@ -1,7 +1,9 @@
 <?php
+
 /**
  * @namespace
  */
+
 namespace Application\UsersPhones;
 
 use Bluz\Validator\Traits\Validator;
@@ -28,7 +30,7 @@ class Row extends \Bluz\Db\Row
     /**
      * @return void
      */
-    protected function afterRead() : void
+    protected function afterRead(): void
     {
         $this->addValidator('userId')
             ->numeric()

diff --git a/application/models/UsersPhones/Table.php b/application/models/UsersPhones/Table.php
@@ -1,7 +1,9 @@
 <?php
+
 /**
  * @namespace
  */
+
 namespace Application\UsersPhones;
 
 /**
@@ -52,7 +54,7 @@ class Table extends \Bluz\Db\Table
      *
      * @return void
      */
-    public function init() : void
+    public function init(): void
     {
         $this->linkTo('userId', 'Users', 'id');
     }

diff --git a/application/modules/phones/controllers/.keep b/application/modules/phones/controllers/.keep
diff --git a/application/modules/phones/controllers/crud.php b/application/modules/phones/controllers/crud.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CRUD controller for UsersPhones model
  *

diff --git a/application/modules/phones/controllers/crud/post.php b/application/modules/phones/controllers/crud/post.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CRUD controller for POST method
  *

diff --git a/application/modules/phones/controllers/grid.php b/application/modules/phones/controllers/grid.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Grid controller for UsersPhones model
  *
@@ -27,7 +28,7 @@
     Layout::breadCrumbs(
         [
             Layout::ahref('Dashboard', ['dashboard', 'index']),
-            __('Pages')
+            __('Phones')
         ]
     );
     $grid = new UsersPhones\Grid();

diff --git a/application/modules/phones/views/.keep b/application/modules/phones/views/.keep
diff --git a/application/modules/phones/views/crud.phtml b/application/modules/phones/views/crud.phtml
@@ -16,9 +16,7 @@ $url = $this->url('phones', 'crud');
   <input type="hidden" id="id" name="id" value="<?= $row['id'] ?>"/>
   <div class="modal-header">
     <h4 class="modal-title"><?=__('Phone number')?></h4>
-    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close" aria-label="Close" data-bs-dismiss="modal"></button>
   </div>
   <div class="modal-body">
     <div class="form-group row">
@@ -53,8 +51,8 @@ $url = $this->url('phones', 'crud');
     <!-- Place additional form fields here -->
   </div>
   <div class="modal-footer">
-    <button type="submit" class="btn btn-primary">Save</button>
-    <a href="#" class="btn btn-default" data-dismiss="modal">Close</a>
+    <button type="submit" class="btn btn-primary"><?=__('Save')?></button>
+      <button type="button" class="btn btn-light" data-bs-dismiss="modal"><?= __('Close') ?></button>
   </div>
 </form>
 <?php

diff --git a/application/modules/phones/views/grid.phtml b/application/modules/phones/views/grid.phtml
@@ -94,11 +94,11 @@ $uid = $grid->getUid();
         <td class="controls d-flex justify-content-around">
           <a href="<?= $this->url('phones', 'crud', ['id' => $row['id']]) ?>" class="btn btn-primary"
              data-ajax-dialog data-ajax-method="get" data-modal-style="modal-lg">
-            <i class="fas fa-pencil-alt"></i>
+              <i class="bi bi-pencil"></i>
           </a>
           <a href="<?= $this->url('phones', 'crud', ['id' => $row['id']]) ?>" class="btn btn-danger"
              data-confirm data-ajax data-ajax-method="delete">
-            <i class="fa fa-trash"></i>
+              <i class="bi bi-trash"></i>
           </a>
         </td>
       </tr>

diff --git a/composer.json b/composer.json
@@ -1,10 +1,9 @@
 {
-  "name": "bluzphp/module-phones",
+  "name": "bluzphp/module-profile",
   "type": "bluz-module",
   "license": "MIT",
-  "description": "bluz phones module",
+  "description": "bluz profile module",
   "require": {
-    "bluzphp/framework": "~7.11",
-    "bluzphp/composer-plugin": "~2.1"
+    "bluzphp/composer-plugin": "~2.4"
   }
 }
diff --git a/data/migrations/20171116155216_users_phones.php b/data/migrations/20171116155216_users_phones.php
@@ -41,6 +41,5 @@ public function change()
                 'update' => 'CASCADE'
             ])
             ->create();
-
     }
 }