From d6108ca3bf9cf072bc5bce9eedb762ea262207b8 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 15:20:10 +0000 Subject: [PATCH 001/118] #76 - Create composer.json --- .phalcon/.gitkeep | 0 composer.json | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) delete mode 100644 .phalcon/.gitkeep create mode 100644 composer.json diff --git a/.phalcon/.gitkeep b/.phalcon/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/composer.json b/composer.json new file mode 100644 index 00000000..2a7a6b2c --- /dev/null +++ b/composer.json @@ -0,0 +1,37 @@ +{ + "name": "phalcon/invo", + "type": "library", + "description": "This is a sample application for the Phalcon PHP Framework", + "keywords": [ + "phalcon", + "framework", + "sample app", + "invo" + ], + "homepage": "https://phalcon.io", + "license": "BSD-3-Clause", + "authors": [ + { + "name": "Contributors", + "homepage": "https://github.com/phalcon/vokuro/graphs/contributors" + } + ], + "require": { + "php": ">=7.2", + "ext-phalcon": "~4.0.0-rc.3" + }, + "require-dev": { + "codeception/codeception": "^3.1", + "phalcon/ide-stubs": "4.0.0-rc.2" + }, + "autoload": { + "psr-4": { + "Invo\\": "app/" + } + }, + "archive": { + "exclude": [ + "CONTRIBUTING.md" + ] + } +} From fa326e5c87587f2f98ec8fb1f01d6b9eb534284d Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 15:20:49 +0000 Subject: [PATCH 002/118] #76 - Refactor of views files --- app/views/about/index.volt | 6 ++- app/views/companies/edit.volt | 59 +++++++++++++---------------- app/views/companies/index.volt | 45 ++++++++++------------ app/views/companies/new.volt | 23 +++++------ app/views/companies/search.volt | 38 +++++++++---------- app/views/contact/index.volt | 1 - app/views/errors/show401.volt | 3 +- app/views/errors/show404.volt | 1 - app/views/errors/show500.volt | 3 +- app/views/index.volt | 31 +++++++-------- app/views/index/index.volt | 1 - app/views/invoices/index.volt | 1 - app/views/invoices/profile.volt | 3 +- app/views/layouts/companies.volt | 2 +- app/views/layouts/invoices.volt | 1 - app/views/layouts/products.volt | 1 - app/views/layouts/producttypes.volt | 1 - app/views/products/edit.volt | 1 - app/views/products/index.volt | 1 - app/views/products/new.volt | 1 - app/views/products/search.volt | 34 ++++++++--------- app/views/producttypes/edit.volt | 59 +++++++++++++---------------- app/views/producttypes/index.volt | 36 ++++++++---------- app/views/producttypes/new.volt | 32 ++++++++-------- app/views/producttypes/search.volt | 28 +++++++------- app/views/register/index.volt | 4 -- app/views/session/index.volt | 4 -- 27 files changed, 189 insertions(+), 231 deletions(-) diff --git a/app/views/about/index.volt b/app/views/about/index.volt index dcf3b09f..215de5ad 100644 --- a/app/views/about/index.volt +++ b/app/views/about/index.volt @@ -3,7 +3,9 @@

-This is a sample application for the Phalcon Framework. We expect to implement as many features as possible to show how the framework works and its potential. -Please write us if you have any feedback or comments. Feel free to clone the code of this application here. +This is a sample application for the Phalcon Framework. +We expect to implement as many features as possible to show how the framework works and its potential. +Please write us if you have any feedback or comments. +Feel free to clone the code of this application here. Thanks!

diff --git a/app/views/companies/edit.volt b/app/views/companies/edit.volt index 788c9dcc..97a87587 100644 --- a/app/views/companies/edit.volt +++ b/app/views/companies/edit.volt @@ -1,34 +1,29 @@ - {{ form("companies/save", 'role': 'form') }} - - - -{{ content() }} - -

Edit companies

- -
- -{% for element in form %} - {% if is_a(element, 'Phalcon\Forms\Element\Hidden') %} -{{ element }} - {% else %} -
- {{ element.label(['class': 'control-label']) }} -
- {{ element }} -
-
- {% endif %} -{% endfor %} - -
- + + + {{ content() }} + +

Edit companies

+ +
+ {% for element in form %} + {% if is_a(element, 'Phalcon\Forms\Element\Hidden') %} + {{ element }} + {% else %} +
+ {{ element.label(['class': 'control-label']) }} +
+ {{ element }} +
+
+ {% endif %} + {% endfor %} +
diff --git a/app/views/companies/index.volt b/app/views/companies/index.volt index 281a69b2..5c9633d7 100644 --- a/app/views/companies/index.volt +++ b/app/views/companies/index.volt @@ -1,4 +1,3 @@ - {{ content() }}
@@ -6,28 +5,24 @@
{{ form("companies/search") }} - -

Search companies

- -
- -{% for element in form %} - {% if is_a(element, 'Phalcon\Forms\Element\Hidden') %} -{{ element }} - {% else %} -
- {{ element.label(['class': 'control-label']) }} -
- {{ element }} -
-
- {% endif %} -{% endfor %} - -
- {{ submit_button("Search", "class": "btn btn-primary") }} -
- -
- +

Search companies

+ +
+ {% for element in form %} + {% if is_a(element, 'Phalcon\Forms\Element\Hidden') %} + {{ element }} + {% else %} +
+ {{ element.label(['class': 'control-label']) }} +
+ {{ element }} +
+
+ {% endif %} + {% endfor %} + +
+ {{ submit_button("Search", "class": "btn btn-primary") }} +
+
diff --git a/app/views/companies/new.volt b/app/views/companies/new.volt index 30377282..dc5d3305 100644 --- a/app/views/companies/new.volt +++ b/app/views/companies/new.volt @@ -1,8 +1,6 @@ - {{ content() }} {{ form("companies/create") }} - {% for company in page.items %} -{% if loop.first %} - - + {% if loop.first %} +
+ @@ -20,21 +20,21 @@ - -{% endif %} + + {% endif %} - - - - - - - - - + + + + + + + + + -{% if loop.last %} - + {% if loop.last %} + - -
Id NameAddress City
{{ company.id }}{{ company.name }}{{ company.telephone }}{{ company.address }}{{ company.city }}{{ link_to("companies/edit/" ~ company.id, ' Edit', "class": "btn btn-default") }}{{ link_to("companies/delete/" ~ company.id, ' Delete', "class": "btn btn-default") }}
{{ company.id }}{{ company.name }}{{ company.telephone }}{{ company.address }}{{ company.city }}{{ link_to("companies/edit/" ~ company.id, ' Edit', "class": "btn btn-default") }}{{ link_to("companies/delete/" ~ company.id, ' Delete', "class": "btn btn-default") }}
@@ -46,9 +46,9 @@
-{% endif %} + + + {% endif %} {% else %} No companies are recorded {% endfor %} diff --git a/app/views/contact/index.volt b/app/views/contact/index.volt index c2b06021..e023553f 100644 --- a/app/views/contact/index.volt +++ b/app/views/contact/index.volt @@ -1,4 +1,3 @@ - {{ content() }}
diff --git a/app/views/errors/show401.volt b/app/views/errors/show401.volt index a536d874..6e54eed6 100644 --- a/app/views/errors/show401.volt +++ b/app/views/errors/show401.volt @@ -1,8 +1,7 @@ - {{ content() }}

Unauthorized

You don't have access to this option. Contact an administrator

{{ link_to('index', 'Home', 'class': 'btn btn-primary') }}

-
\ No newline at end of file +
diff --git a/app/views/errors/show404.volt b/app/views/errors/show404.volt index aa2410d1..091d9e29 100644 --- a/app/views/errors/show404.volt +++ b/app/views/errors/show404.volt @@ -1,4 +1,3 @@ - {{ content() }}
diff --git a/app/views/errors/show500.volt b/app/views/errors/show500.volt index aea18d09..336ee7fb 100644 --- a/app/views/errors/show500.volt +++ b/app/views/errors/show500.volt @@ -1,8 +1,7 @@ - {{ content() }}

Internal Error

Something went wrong, if the error continue please contact us

{{ link_to('index', 'Home', 'class': 'btn btn-primary') }}

-
\ No newline at end of file +
diff --git a/app/views/index.volt b/app/views/index.volt index 1cf455f1..5b5097a2 100644 --- a/app/views/index.volt +++ b/app/views/index.volt @@ -1,17 +1,18 @@ - - - - {{ get_title() }} - {{ stylesheet_link('css/bootstrap.min.css') }} - - - - - - {{ content() }} - {{ javascript_include('js/jquery.min.js') }} - {{ javascript_include('js/bootstrap.min.js') }} - {{ javascript_include('js/utils.js') }} - + + + Phalcon Invo + + {{ get_title() }} + {{ stylesheet_link('css/bootstrap.min.css') }} + + + + + +{{ content() }} +{{ javascript_include('js/jquery.min.js') }} +{{ javascript_include('js/bootstrap.min.js') }} +{{ javascript_include('js/utils.js') }} + diff --git a/app/views/index/index.volt b/app/views/index/index.volt index 0fdd2f6b..c29ecb13 100644 --- a/app/views/index/index.volt +++ b/app/views/index/index.volt @@ -1,4 +1,3 @@ - {{ content() }}
diff --git a/app/views/invoices/index.volt b/app/views/invoices/index.volt index 0ed5aaf6..90b91d1a 100644 --- a/app/views/invoices/index.volt +++ b/app/views/invoices/index.volt @@ -41,4 +41,3 @@ - diff --git a/app/views/invoices/profile.volt b/app/views/invoices/profile.volt index db607d74..a0220ee2 100644 --- a/app/views/invoices/profile.volt +++ b/app/views/invoices/profile.volt @@ -1,4 +1,3 @@ - {{ content() }}
@@ -27,4 +26,4 @@ {{ link_to('invoices/index', 'Cancel') }}
-
\ No newline at end of file + diff --git a/app/views/layouts/companies.volt b/app/views/layouts/companies.volt index c4e713cd..60e5a47c 100644 --- a/app/views/layouts/companies.volt +++ b/app/views/layouts/companies.volt @@ -2,4 +2,4 @@
{{ content() }} -
\ No newline at end of file + diff --git a/app/views/layouts/invoices.volt b/app/views/layouts/invoices.volt index f12a1087..60e5a47c 100644 --- a/app/views/layouts/invoices.volt +++ b/app/views/layouts/invoices.volt @@ -1,4 +1,3 @@ - {{ elements.getTabs() }}
diff --git a/app/views/layouts/products.volt b/app/views/layouts/products.volt index f12a1087..60e5a47c 100644 --- a/app/views/layouts/products.volt +++ b/app/views/layouts/products.volt @@ -1,4 +1,3 @@ - {{ elements.getTabs() }}
diff --git a/app/views/layouts/producttypes.volt b/app/views/layouts/producttypes.volt index f12a1087..60e5a47c 100644 --- a/app/views/layouts/producttypes.volt +++ b/app/views/layouts/producttypes.volt @@ -1,4 +1,3 @@ - {{ elements.getTabs() }}
diff --git a/app/views/products/edit.volt b/app/views/products/edit.volt index 3ac74435..0ad1496f 100644 --- a/app/views/products/edit.volt +++ b/app/views/products/edit.volt @@ -1,4 +1,3 @@ - {{ form("products/save", 'role': 'form') }}
    diff --git a/app/views/products/index.volt b/app/views/products/index.volt index f690a475..1393729c 100644 --- a/app/views/products/index.volt +++ b/app/views/products/index.volt @@ -1,4 +1,3 @@ - {{ content() }}
    diff --git a/app/views/products/new.volt b/app/views/products/new.volt index 42aa8cf0..52c2a3b7 100644 --- a/app/views/products/new.volt +++ b/app/views/products/new.volt @@ -1,4 +1,3 @@ - {{ content() }} {{ form("products/create") }} diff --git a/app/views/products/search.volt b/app/views/products/search.volt index c3d394d8..700a2f19 100644 --- a/app/views/products/search.volt +++ b/app/views/products/search.volt @@ -11,8 +11,8 @@ {% for product in page.items %} {% if loop.first %} - - +
    + @@ -20,21 +20,21 @@ - - + + {% endif %} - - - - - - - - - + + + + + + + + + {% if loop.last %} - - + + - -
    Id Product TypePrice Active
    {{ product.id }}{{ product.getProductTypes().name }}{{ product.name }}${{ "%.2f"|format(product.price) }}{{ product.getActiveDetail() }}{{ link_to("products/edit/" ~ product.id, ' Edit', "class": "btn btn-default") }}{{ link_to("products/delete/" ~ product.id, ' Delete', "class": "btn btn-default") }}
    {{ product.id }}{{ product.getProductTypes().name }}{{ product.name }}${{ "%.2f"|format(product.price) }}{{ product.getActiveDetail() }}{{ link_to("products/edit/" ~ product.id, ' Edit', "class": "btn btn-default") }}{{ link_to("products/delete/" ~ product.id, ' Delete', "class": "btn btn-default") }}
    @@ -46,8 +46,8 @@
    + + {% endif %} {% else %} No products are recorded diff --git a/app/views/producttypes/edit.volt b/app/views/producttypes/edit.volt index f9abdd13..2c3e657c 100644 --- a/app/views/producttypes/edit.volt +++ b/app/views/producttypes/edit.volt @@ -1,34 +1,29 @@ {{ form("producttypes/save", 'role': 'form') }} - -
      - -
    • - {{ submit_button("Save", "class": "btn btn-success") }} -
      • -
    - -{{ content() }} - -

    Edit Product Types

    - -
    - -{% for element in form %} - {% if is_a(element, 'Phalcon\Forms\Element\Hidden') %} -{{ element }} - {% else %} -
    - {{ element.label(['class': 'control-label']) }} -
    - {{ element }} -
    -
    - {% endif %} -{% endfor %} - -
    - +
      + +
    • + {{ submit_button("Save", "class": "btn btn-success") }} +
      • +
    + + {{ content() }} + +

    Edit Product Types

    + +
    + {% for element in form %} + {% if is_a(element, 'Phalcon\Forms\Element\Hidden') %} + {{ element }} + {% else %} +
    + {{ element.label(['class': 'control-label']) }} +
    + {{ element }} +
    +
    + {% endif %} + {% endfor %} +
    - diff --git a/app/views/producttypes/index.volt b/app/views/producttypes/index.volt index f68960f1..071f183d 100644 --- a/app/views/producttypes/index.volt +++ b/app/views/producttypes/index.volt @@ -5,25 +5,21 @@
    {{ form("producttypes/search", "autocomplete": "off") }} - -
    - -

    Search product types

    - -
    - - {{ numeric_field("id", "size": 10, "maxlength": 10) }} -
    - -
    - - {{ text_field("name", "size": 24, "maxlength": 70) }} +
    +

    Search product types

    + +
    + + {{ numeric_field("id", "size": 10, "maxlength": 10) }} +
    + +
    + + {{ text_field("name", "size": 24, "maxlength": 70) }} +
    + +
    + {{ submit_button("Search", "class": "btn btn-primary") }} +
    - -
    - {{ submit_button("Search", "class": "btn btn-primary") }} -
    - -
    - diff --git a/app/views/producttypes/new.volt b/app/views/producttypes/new.volt index 095bbd27..616ce8f9 100644 --- a/app/views/producttypes/new.volt +++ b/app/views/producttypes/new.volt @@ -1,23 +1,21 @@ {{ form("producttypes/create", "autocomplete": "off") }} +
      + +
    • + {{ submit_button("Save", "class": "btn btn-success") }} +
      • +
    -
      - -
    • - {{ submit_button("Save", "class": "btn btn-success") }} -
      • -
    + {{ content() }} -{{ content() }} +
    +

    Create product types

    -
    -

    Create product types

    - -
    - - {{ text_field("name", "size": 24, "maxlength": 70) }} +
    + + {{ text_field("name", "size": 24, "maxlength": 70) }} +
    - -
    diff --git a/app/views/producttypes/search.volt b/app/views/producttypes/search.volt index 81b7118b..2e0826d3 100644 --- a/app/views/producttypes/search.volt +++ b/app/views/producttypes/search.volt @@ -11,24 +11,24 @@ {% for producttype in page.items %} {% if loop.first %} - - +
    + - - + + {% endif %} - - - - - - + + + + + + {% if loop.last %} - - + + - -
    Id Name
    {{ producttype.id }}{{ producttype.name }}{{ link_to("producttypes/edit/" ~ producttype.id, ' Edit', "class": "btn btn-default") }}{{ link_to("producttypes/delete/" ~ producttype.id, ' Delete', "class": "btn btn-default") }}
    {{ producttype.id }}{{ producttype.name }}{{ link_to("producttypes/edit/" ~ producttype.id, ' Edit', "class": "btn btn-default") }}{{ link_to("producttypes/delete/" ~ producttype.id, ' Delete', "class": "btn btn-default") }}
    @@ -40,8 +40,8 @@
    + + {% endif %} {% else %} No product types are recorded diff --git a/app/views/register/index.volt b/app/views/register/index.volt index d98b4a71..a1de68f5 100644 --- a/app/views/register/index.volt +++ b/app/views/register/index.volt @@ -1,4 +1,3 @@ - {{ content() }}
    @@ -6,9 +5,7 @@
    {{ form('register', 'id': 'registerForm', 'onbeforesubmit': 'return false') }} -
    -
    {{ form.label('name', ['class': 'control-label']) }}
    @@ -67,6 +64,5 @@ {{ submit_button('Register', 'class': 'btn btn-primary', 'onclick': 'return SignUp.validate();') }}

    By signing up, you accept terms of use and privacy policy.

    -
    diff --git a/app/views/session/index.volt b/app/views/session/index.volt index 4132c0c0..38489f9d 100644 --- a/app/views/session/index.volt +++ b/app/views/session/index.volt @@ -1,8 +1,6 @@ - {{ content() }}
    -

    Log In

    @@ -29,7 +27,6 @@
    -

    Don't have an account yet?

    @@ -45,5 +42,4 @@ {{ link_to('register', 'Sign Up', 'class': 'btn btn-primary btn-large btn-success') }}
    -
    From 713f2376689d2ce06f046984a59afcb3138a4ea9 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 15:31:20 +0000 Subject: [PATCH 003/118] #76 - Add php_codesniffer and psalm dev packages --- composer.json | 4 +- phpcs.xml.dist | 13 +++++ psalm.xml | 149 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 phpcs.xml.dist create mode 100644 psalm.xml diff --git a/composer.json b/composer.json index 2a7a6b2c..ae4fcb41 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,9 @@ }, "require-dev": { "codeception/codeception": "^3.1", - "phalcon/ide-stubs": "4.0.0-rc.2" + "phalcon/ide-stubs": "4.0.0-rc.2", + "squizlabs/php_codesniffer": "3.5", + "vimeo/psalm": "^3.6" }, "autoload": { "psr-4": { diff --git a/phpcs.xml.dist b/phpcs.xml.dist new file mode 100644 index 00000000..686502a6 --- /dev/null +++ b/phpcs.xml.dist @@ -0,0 +1,13 @@ + + + Phalcon Coding Standards + + + + + + + + app + public/index.php + diff --git a/psalm.xml b/psalm.xml new file mode 100644 index 00000000..be2f3c92 --- /dev/null +++ b/psalm.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 87f4395479bcc2008d56d9e1100a73cfe4a36019 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 15:37:47 +0000 Subject: [PATCH 004/118] #76 - Add namespaces for each .php file --- app/Services.php | 16 ++++++++++------ app/config/config.ini | 1 - app/controllers/AboutController.php | 3 +++ app/controllers/CompaniesController.php | 3 +++ app/controllers/ContactController.php | 3 +++ app/controllers/ControllerBase.php | 4 +++- app/controllers/ErrorsController.php | 3 +++ app/controllers/IndexController.php | 3 +++ app/controllers/InvoicesController.php | 3 +++ app/controllers/ProductsController.php | 3 +++ app/controllers/ProducttypesController.php | 3 +++ app/controllers/RegisterController.php | 3 +++ app/controllers/SessionController.php | 3 +++ app/forms/CompaniesForm.php | 8 +++++--- app/forms/ContactForm.php | 7 +++++-- app/forms/ProductTypesForm.php | 3 +++ app/forms/ProductsForm.php | 10 ++++++---- app/forms/RegisterForm.php | 9 ++++++--- app/library/Base/Services.php | 1 + app/models/Companies.php | 3 +++ app/models/Contact.php | 5 ++++- app/models/ProductTypes.php | 3 +++ app/models/Products.php | 3 +++ app/models/Users.php | 3 +++ app/plugins/NotFoundPlugin.php | 19 +++++++++++-------- app/plugins/SecurityPlugin.php | 12 +++++++----- 26 files changed, 103 insertions(+), 34 deletions(-) diff --git a/app/Services.php b/app/Services.php index 34a8667e..c0add24c 100644 --- a/app/Services.php +++ b/app/Services.php @@ -1,14 +1,18 @@ tag->prependTitle('INVO | '); - $this->view->setTemplateAfter('main'); } } diff --git a/app/controllers/ErrorsController.php b/app/controllers/ErrorsController.php index 6f15594c..25bb2085 100644 --- a/app/controllers/ErrorsController.php +++ b/app/controllers/ErrorsController.php @@ -1,4 +1,7 @@ getMessage() . PHP_EOL . $exception->getTraceAsString() @@ -29,8 +32,8 @@ public function beforeException(Event $event, MvcDispatcher $dispatcher, \Except if ($exception instanceof DispatcherException) { switch ($exception->getCode()) { - case Dispatcher::EXCEPTION_HANDLER_NOT_FOUND: - case Dispatcher::EXCEPTION_ACTION_NOT_FOUND: + case MvcDispatcher::EXCEPTION_HANDLER_NOT_FOUND: + case MvcDispatcher::EXCEPTION_ACTION_NOT_FOUND: $dispatcher->forward( [ 'controller' => 'errors', diff --git a/app/plugins/SecurityPlugin.php b/app/plugins/SecurityPlugin.php index 5e43298e..4a410778 100644 --- a/app/plugins/SecurityPlugin.php +++ b/app/plugins/SecurityPlugin.php @@ -1,19 +1,21 @@ Date: Sat, 23 Nov 2019 16:42:01 +0000 Subject: [PATCH 005/118] #76 - Refactor of controllers --- app/controllers/AboutController.php | 6 +- app/controllers/CompaniesController.php | 42 ++-- app/controllers/ContactController.php | 59 +++--- app/controllers/IndexController.php | 14 +- app/controllers/InvoicesController.php | 36 ++-- app/controllers/ProductsController.php | 212 ++++++++----------- app/controllers/ProducttypesController.php | 230 +++++++++------------ app/controllers/RegisterController.php | 38 ++-- app/controllers/SessionController.php | 96 ++++----- 9 files changed, 295 insertions(+), 438 deletions(-) diff --git a/app/controllers/AboutController.php b/app/controllers/AboutController.php index eca2c802..bcb691cc 100644 --- a/app/controllers/AboutController.php +++ b/app/controllers/AboutController.php @@ -7,12 +7,12 @@ class AboutController extends ControllerBase { public function initialize() { - $this->tag->setTitle('About us'); - parent::initialize(); + + $this->tag->setTitle('About us'); } - public function indexAction() + public function indexAction(): void { } } diff --git a/app/controllers/CompaniesController.php b/app/controllers/CompaniesController.php index fa24e05c..229f4f0b 100644 --- a/app/controllers/CompaniesController.php +++ b/app/controllers/CompaniesController.php @@ -3,6 +3,8 @@ namespace Invo\Controllers; +use Invo\Forms\CompaniesForm; +use Invo\Models\Companies; use Phalcon\Mvc\Model\Criteria; use Phalcon\Paginator\Adapter\Model as Paginator; @@ -10,9 +12,9 @@ class CompaniesController extends ControllerBase { public function initialize() { - $this->tag->setTitle('Manage your companies'); - parent::initialize(); + + $this->tag->setTitle('Manage your companies'); } /** @@ -21,7 +23,6 @@ public function initialize() public function indexAction() { $this->session->conditions = null; - $this->view->form = new CompaniesForm; } @@ -77,40 +78,29 @@ public function searchAction() */ public function newAction() { - $this->view->form = new CompaniesForm( - null, - [ - 'edit' => true, - ] - ); + $this->view->form = new CompaniesForm(null, ['edit' => true]); } /** * Edits a company based on its id + * + * @param int $id */ public function editAction($id) { - if (!$this->request->isPost()) { - $company = Companies::findFirstById($id); - - if (!$company) { - $this->flash->error("Company was not found"); - - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "index", - ] - ); - } + $company = Companies::findFirstById($id); + if (!$company) { + $this->flash->error('Company was not found'); - $this->view->form = new CompaniesForm( - $company, + return $this->dispatcher->forward( [ - 'edit' => true, + "controller" => "companies", + "action" => "index", ] ); } + + $this->view->form = new CompaniesForm($company, ['edit' => true]); } /** @@ -146,7 +136,7 @@ public function createAction() if ($company->save() == false) { foreach ($company->getMessages() as $message) { - $this->flash->error($message); + $this->flash->error((string)$message); } return $this->dispatcher->forward( diff --git a/app/controllers/ContactController.php b/app/controllers/ContactController.php index 0e69068a..9d481e4a 100644 --- a/app/controllers/ContactController.php +++ b/app/controllers/ContactController.php @@ -3,6 +3,9 @@ namespace Invo\Controllers; +use Invo\Forms\ContactForm; +use Invo\Models\Contact; + /** * ContactController * @@ -12,12 +15,12 @@ class ContactController extends ControllerBase { public function initialize() { - $this->tag->setTitle('Contact us'); - parent::initialize(); + + $this->tag->setTitle('Contact us'); } - public function indexAction() + public function indexAction(): void { $this->view->form = new ContactForm; } @@ -27,13 +30,11 @@ public function indexAction() */ public function sendAction() { - if ($this->request->isPost() != true) { - return $this->dispatcher->forward( - [ - "controller" => "contact", - "action" => "index", - ] - ); + if (!$this->request->isPost()) { + return $this->dispatcher->forward([ + 'controller' => 'contact', + 'action' => 'index', + ]); } $form = new ContactForm; @@ -47,36 +48,28 @@ public function sendAction() $this->flash->error($message); } - return $this->dispatcher->forward( - [ - "controller" => "contact", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'contact', + 'action' => 'index', + ]); } - if ($contact->save() == false) { + if (!$contact->save()) { foreach ($contact->getMessages() as $message) { - $this->flash->error($message); + $this->flash->error((string)$message); } - return $this->dispatcher->forward( - [ - "controller" => "contact", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'contact', + 'action' => 'index', + ]); } - $this->flash->success( - 'Thanks, we will contact you in the next few hours' - ); + $this->flash->success('Thanks, we will contact you in the next few hours'); - return $this->dispatcher->forward( - [ - "controller" => "index", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'index', + 'action' => 'index', + ]); } } diff --git a/app/controllers/IndexController.php b/app/controllers/IndexController.php index b909eb02..bfc0bfcb 100644 --- a/app/controllers/IndexController.php +++ b/app/controllers/IndexController.php @@ -7,18 +7,16 @@ class IndexController extends ControllerBase { public function initialize() { - $this->tag->setTitle('Welcome'); - parent::initialize(); + + $this->tag->setTitle('Welcome'); } - public function indexAction() + public function indexAction(): void { - if (!$this->request->isPost()) { - $this->flash->notice( - 'This is a sample application of the Phalcon Framework. + $this->flash->notice( + 'This is a sample application of the Phalcon Framework. Please don\'t provide us any personal information. Thanks' - ); - } + ); } } diff --git a/app/controllers/InvoicesController.php b/app/controllers/InvoicesController.php index 69ac8aad..cc4b6392 100644 --- a/app/controllers/InvoicesController.php +++ b/app/controllers/InvoicesController.php @@ -3,13 +3,12 @@ namespace Invo\Controllers; -use Phalcon\Flash; -use Phalcon\Session; +use Invo\Models\Users; /** * InvoicesController * - * Manage operations for invoises + * Manage operations for invoices */ class InvoicesController extends ControllerBase { @@ -20,7 +19,7 @@ public function initialize() parent::initialize(); } - public function indexAction() + public function indexAction(): void { } @@ -34,35 +33,26 @@ public function profileAction() //Query the active user $user = Users::findFirst($auth['id']); - if ($user == false) { - return $this->dispatcher->forward( - [ - "controller" => "index", - "action" => "index", - ] - ); + if (!$user) { + return $this->dispatcher->forward([ + 'controller' => 'index', + 'action' => 'index', + ]); } if (!$this->request->isPost()) { $this->tag->setDefault('name', $user->name); $this->tag->setDefault('email', $user->email); } else { - $name = $this->request->getPost('name', ['string', 'striptags']); - $email = $this->request->getPost('email', 'email'); + $user->name = $this->request->getPost('name', ['string', 'striptags']); + $user->email = $this->request->getPost('email', 'email'); - $user->name = $name; - $user->email = $email; - - if ($user->save() == false) { + if (!$user->save()) { foreach ($user->getMessages() as $message) { - $this->flash->error( - (string) $message - ); + $this->flash->error((string) $message); } } else { - $this->flash->success( - 'Your profile information was updated successfully' - ); + $this->flash->success('Your profile information was updated successfully'); } } } diff --git a/app/controllers/ProductsController.php b/app/controllers/ProductsController.php index 3565f70a..c4b540c4 100644 --- a/app/controllers/ProductsController.php +++ b/app/controllers/ProductsController.php @@ -3,6 +3,7 @@ namespace Invo\Controllers; +use Invo\Models\Products; use Phalcon\Mvc\Model\Criteria; use Phalcon\Paginator\Adapter\Model as Paginator; @@ -15,18 +16,17 @@ class ProductsController extends ControllerBase { public function initialize() { - $this->tag->setTitle('Manage your products'); - parent::initialize(); + + $this->tag->setTitle('Manage your products'); } /** * Shows the index action */ - public function indexAction() + public function indexAction(): void { $this->session->conditions = null; - $this->view->form = new ProductsForm; } @@ -57,21 +57,17 @@ public function searchAction() if (count($products) == 0) { $this->flash->notice("The search did not find any products"); - return $this->dispatcher->forward( - [ - "controller" => "products", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'products', + 'action' => 'index', + ]); } - $paginator = new Paginator( - [ - "data" => $products, - "limit" => 10, - "page" => $numberPage, - ] - ); + $paginator = new Paginator([ + 'data' => $products, + 'limit' => 10, + 'page' => $numberPage, + ]); $this->view->page = $paginator->getPaginate(); } @@ -79,42 +75,29 @@ public function searchAction() /** * Shows the form to create a new product */ - public function newAction() + public function newAction(): void { - $this->view->form = new ProductsForm( - null, - [ - 'edit' => true, - ] - ); + $this->view->form = new ProductsForm(null, ['edit' => true]); } /** * Edits a product based on its id + * + * @param $id */ - public function editAction($id) + public function editAction($id): void { - if (!$this->request->isPost()) { - $product = Products::findFirstById($id); - - if (!$product) { - $this->flash->error("Product was not found"); - - return $this->dispatcher->forward( - [ - "controller" => "products", - "action" => "index", - ] - ); - } + $product = Products::findFirstById($id); + if (!$product) { + $this->flash->error('Product was not found'); - $this->view->form = new ProductsForm( - $product, - [ - 'edit' => true, - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'products', + 'action' => 'index', + ]); } + + $this->view->form = new ProductsForm($product, ['edit' => true]); } /** @@ -141,74 +124,57 @@ public function createAction() $this->flash->error($message); } - return $this->dispatcher->forward( - [ - "controller" => "products", - "action" => "new", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'products', + 'action' => 'new', + ]); } - if ($product->save() == false) { + if (!$product->save()) { foreach ($product->getMessages() as $message) { - $this->flash->error($message); + $this->flash->error((string)$message); } - return $this->dispatcher->forward( - [ - "controller" => "products", - "action" => "new", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'products', + 'action' => 'new', + ]); } $form->clear(); + $this->flash->success('Product was created successfully'); - $this->flash->success("Product was created successfully"); - - return $this->dispatcher->forward( - [ - "controller" => "products", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'products', + 'action' => 'index', + ]); } /** * Saves current product in screen - * - * @param string $id */ public function saveAction() { if (!$this->request->isPost()) { - return $this->dispatcher->forward( - [ - "controller" => "products", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'products', + 'action' => 'index', + ]); } - $id = $this->request->getPost("id", "int"); - + $id = $this->request->getPost('id', 'int'); $product = Products::findFirstById($id); - if (!$product) { - $this->flash->error("Product does not exist"); + $this->flash->error('Product does not exist'); - return $this->dispatcher->forward( - [ - "controller" => "products", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'products', + 'action' => 'index', + ]); } $form = new ProductsForm; - $this->view->form = $form; - $data = $this->request->getPost(); if (!$form->isValid($data, $product)) { @@ -216,39 +182,32 @@ public function saveAction() $this->flash->error($message); } - return $this->dispatcher->forward( - [ - "controller" => "products", - "action" => "edit", - "params" => [$id] - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'products', + 'action' => 'edit', + 'params' => [$id], + ]); } - if ($product->save() == false) { + if (!$product->save()) { foreach ($product->getMessages() as $message) { $this->flash->error($message); } - return $this->dispatcher->forward( - [ - "controller" => "products", - "action" => "edit", - "params" => [$id] - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'products', + 'action' => 'edit', + 'params' => [$id], + ]); } $form->clear(); + $this->flash->success('Product was updated successfully'); - $this->flash->success("Product was updated successfully"); - - return $this->dispatcher->forward( - [ - "controller" => "products", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'products', + 'action' => 'index', + ]); } /** @@ -259,16 +218,13 @@ public function saveAction() public function deleteAction($id) { $products = Products::findFirstById($id); - if (!$products) { - $this->flash->error("Product was not found"); + $this->flash->error('Product was not found'); - return $this->dispatcher->forward( - [ - "controller" => "products", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'products', + 'action' => 'index', + ]); } if (!$products->delete()) { @@ -276,21 +232,17 @@ public function deleteAction($id) $this->flash->error($message); } - return $this->dispatcher->forward( - [ - "controller" => "products", - "action" => "search", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'products', + 'action' => 'search', + ]); } - $this->flash->success("Product was deleted"); + $this->flash->success('Product was deleted'); - return $this->dispatcher->forward( - [ - "controller" => "products", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'products', + 'action' => 'index', + ]); } } diff --git a/app/controllers/ProducttypesController.php b/app/controllers/ProducttypesController.php index 924edc81..a4ed4002 100644 --- a/app/controllers/ProducttypesController.php +++ b/app/controllers/ProducttypesController.php @@ -3,6 +3,8 @@ namespace Invo\Controllers; +use Invo\Forms\ProductTypesForm; +use Invo\Models\ProductTypes; use Phalcon\Mvc\Model\Criteria; use Phalcon\Paginator\Adapter\Model as Paginator; @@ -23,10 +25,9 @@ public function initialize() /** * Shows the index action */ - public function indexAction() + public function indexAction(): void { $this->session->conditions = null; - $this->view->form = new ProductTypesForm; } @@ -39,13 +40,13 @@ public function searchAction() if ($this->request->isPost()) { $query = Criteria::fromInput( $this->di, - "ProductTypes", + 'ProductTypes', $this->request->getPost() ); $this->persistent->searchParams = $query->getParams(); } else { - $numberPage = $this->request->getQuery("page", "int"); + $numberPage = $this->request->getQuery('page', 'int'); } $parameters = []; @@ -54,25 +55,20 @@ public function searchAction() } $productTypes = ProductTypes::find($parameters); + if (count($productTypes) === 0) { + $this->flash->notice('The search did not find any product types'); - if (count($productTypes) == 0) { - $this->flash->notice("The search did not find any product types"); - - return $this->dispatcher->forward( - [ - "controller" => "producttypes", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'producttypes', + 'action' => 'index', + ]); } - $paginator = new Paginator( - [ - "data" => $productTypes, - "limit" => 10, - "page" => $numberPage, - ] - ); + $paginator = new Paginator([ + 'data' => $productTypes, + 'limit' => 10, + 'page' => $numberPage, + ]); $this->view->page = $paginator->getPaginate(); $this->view->productTypes = $productTypes; @@ -81,42 +77,29 @@ public function searchAction() /** * Shows the form to create a new producttype */ - public function newAction() + public function newAction(): void { - $this->view->form = new ProductTypesForm( - null, - [ - 'edit' => true, - ] - ); + $this->view->form = new ProductTypesForm(null, ['edit' => true]); } /** * Edits a producttype based on its id + * + * @param int $id */ public function editAction($id) { - if (!$this->request->isPost()) { - $producttypes = ProductTypes::findFirstById($id); - - if (!$producttypes) { - $this->flash->error("Product type to edit was not found"); - - return $this->dispatcher->forward( - [ - "controller" => "producttypes", - "action" => "index", - ] - ); - } + $productTypes = ProductTypes::findFirstById($id); + if (!$productTypes) { + $this->flash->error('Product type to edit was not found'); - $this->view->form = new ProductTypesForm( - $producttypes, - [ - 'edit' => true, - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'producttypes', + 'action' => 'index', + ]); } + + $this->view->form = new ProductTypesForm($productTypes, ['edit' => true]); } /** @@ -125,165 +108,136 @@ public function editAction($id) public function createAction() { if (!$this->request->isPost()) { - return $this->dispatcher->forward( - [ - "controller" => "producttypes", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'producttypes', + 'action' => 'index', + ]); } $form = new ProductTypesForm; - $producttypes = new ProductTypes(); + $productTypes = new ProductTypes(); $data = $this->request->getPost(); - if (!$form->isValid($data, $producttypes)) { + if (!$form->isValid($data, $productTypes)) { foreach ($form->getMessages() as $message) { - $this->flash->error($message); + $this->flash->error((string)$message); } - return $this->dispatcher->forward( - [ - "controller" => "producttypes", - "action" => "new", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'producttypes', + 'action' => 'new', + ]); } - if ($producttypes->save() == false) { - foreach ($producttypes->getMessages() as $message) { - $this->flash->error($message); + if (!$productTypes->save()) { + foreach ($productTypes->getMessages() as $message) { + $this->flash->error((string)$message); } - return $this->dispatcher->forward( - [ - "controller" => "producttypes", - "action" => "new", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'producttypes', + 'action' => 'new', + ]); } $form->clear(); + $this->flash->success('Product type was created successfully'); - $this->flash->success("Product type was created successfully"); - - return $this->dispatcher->forward( - [ - "controller" => "producttypes", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'producttypes', + 'action' => 'index', + ]); } /** * Saves current producttypes in screen - * - * @param string $id */ public function saveAction() { if (!$this->request->isPost()) { - return $this->dispatcher->forward( - [ - "controller" => "producttypes", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'producttypes', + 'action' => 'index', + ]); } - $id = $this->request->getPost("id", "int"); + $id = $this->request->getPost('id', 'int'); $productTypes = ProductTypes::findFirstById($id); if (!$productTypes) { - $this->flash->error("productTypes does not exist"); + $this->flash->error('productTypes does not exist'); - return $this->dispatcher->forward( - [ - "controller" => "producttypes", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'producttypes', + 'action' => 'index', + ]); } $form = new ProductTypesForm; - $data = $this->request->getPost(); if (!$form->isValid($data, $productTypes)) { foreach ($form->getMessages() as $message) { $this->flash->error($message); } - return $this->dispatcher->forward( - [ - "controller" => "producttypes", - "action" => "new", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'producttypes', + 'action' => 'new', + ]); } - if ($productTypes->save() == false) { + if (!$productTypes->save()) { foreach ($productTypes->getMessages() as $message) { $this->flash->error($message); } - return $this->dispatcher->forward( - [ - "controller" => "producttypes", - "action" => "new", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'producttypes', + 'action' => 'new', + ]); } $form->clear(); + $this->flash->success('Product Type was updated successfully'); - $this->flash->success("Product Type was updated successfully"); - - return $this->dispatcher->forward( - [ - "controller" => "producttypes", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'producttypes', + 'action' => 'index', + ]); } /** * Deletes a producttypes * - * @param string $id + * @param int $id */ public function deleteAction($id) { $productTypes = ProductTypes::findFirstById($id); if (!$productTypes) { - $this->flash->error("Product types was not found"); + $this->flash->error('Product types was not found'); - return $this->dispatcher->forward( - [ - "controller" => "producttypes", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'producttypes', + 'action' => 'index', + ]); } if (!$productTypes->delete()) { foreach ($productTypes->getMessages() as $message) { - $this->flash->error($message); + $this->flash->error((string)$message); } - return $this->dispatcher->forward( - [ - "controller" => "producttypes", - "action" => "search", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'producttypes', + 'action' => 'search', + ]); } - $this->flash->success("product types was deleted"); + $this->flash->success('product types was deleted'); - return $this->dispatcher->forward( - [ - "controller" => "producttypes", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'producttypes', + 'action' => 'index', + ]); } } diff --git a/app/controllers/RegisterController.php b/app/controllers/RegisterController.php index bf141916..70a9c65a 100644 --- a/app/controllers/RegisterController.php +++ b/app/controllers/RegisterController.php @@ -3,6 +3,10 @@ namespace Invo\Controllers; +use Invo\Forms\RegisterForm; +use Invo\Models\Users; +use Phalcon\Db\RawValue; + /** * SessionController * @@ -25,47 +29,37 @@ public function indexAction() $form = new RegisterForm; if ($this->request->isPost()) { - $name = $this->request->getPost('name', ['string', 'striptags']); - $username = $this->request->getPost('username', 'alphanum'); - $email = $this->request->getPost('email', 'email'); $password = $this->request->getPost('password'); $repeatPassword = $this->request->getPost('repeatPassword'); - if ($password != $repeatPassword) { + if ($password !== $repeatPassword) { $this->flash->error('Passwords are different'); return false; } $user = new Users(); - - $user->username = $username; + $user->username = $this->request->getPost('username', 'alphanum'); $user->password = sha1($password); - $user->name = $name; - $user->email = $email; - $user->created_at = new Phalcon\Db\RawValue('now()'); + $user->name = $this->request->getPost('name', ['string', 'striptags']); + $user->email = $this->request->getPost('email', 'email'); + $user->created_at = new RawValue('now()'); $user->active = 'Y'; - if ($user->save() == false) { + if (!$user->save()) { foreach ($user->getMessages() as $message) { - $this->flash->error( - (string) $message - ); + $this->flash->error((string) $message); } } else { $this->tag->setDefault('email', ''); $this->tag->setDefault('password', ''); - $this->flash->success( - 'Thanks for sign-up, please log-in to start generating invoices' - ); + $this->flash->success('Thanks for sign-up, please log-in to start generating invoices'); - return $this->dispatcher->forward( - [ - "controller" => "session", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'session', + 'action' => 'index', + ]); } } diff --git a/app/controllers/SessionController.php b/app/controllers/SessionController.php index ba1b5931..a881abe5 100644 --- a/app/controllers/SessionController.php +++ b/app/controllers/SessionController.php @@ -3,6 +3,8 @@ namespace Invo\Controllers; +use Invo\Models\Users; + /** * SessionController * @@ -12,33 +14,15 @@ class SessionController extends ControllerBase { public function initialize() { - $this->tag->setTitle('Sign Up/Sign In'); - parent::initialize(); - } - public function indexAction() - { - if (!$this->request->isPost()) { - $this->tag->setDefault('email', 'demo'); - $this->tag->setDefault('password', 'phalcon'); - } + $this->tag->setTitle('Sign Up/Sign In'); } - /** - * Register an authenticated user into session data - * - * @param Users $user - */ - private function _registerSession(Users $user) + public function indexAction(): void { - $this->session->set( - 'auth', - [ - 'id' => $user->id, - 'name' => $user->name, - ] - ); + $this->tag->setDefault('email', 'demo'); + $this->tag->setDefault('password', 'phalcon'); } /** @@ -50,56 +34,58 @@ public function startAction() $email = $this->request->getPost('email'); $password = $this->request->getPost('password'); - $user = Users::findFirst( - [ - "(email = :email: OR username = :email:) AND password = :password: AND active = 'Y'", - 'bind' => [ - 'email' => $email, - 'password' => sha1($password), - ] - ] - ); - - if ($user != false) { - $this->_registerSession($user); + /** @var Users $user */ + $user = Users::findFirst([ + "(email = :email: OR username = :email:) AND password = :password: AND active = 'Y'", + 'bind' => [ + 'email' => $email, + 'password' => sha1($password), + ], + ]); + if ($user) { + $this->registerSession($user); $this->flash->success('Welcome ' . $user->name); - return $this->dispatcher->forward( - [ - "controller" => "invoices", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'invoices', + 'action' => 'index', + ]); } $this->flash->error('Wrong email/password'); } - return $this->dispatcher->forward( - [ - "controller" => "session", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'session', + 'action' => 'index', + ]); } /** * Finishes the active session redirecting to the index - * - * @return unknown */ public function endAction() { $this->session->remove('auth'); - $this->flash->success('Goodbye!'); - return $this->dispatcher->forward( - [ - "controller" => "index", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'index', + 'action' => 'index', + ]); + } + + /** + * Register an authenticated user into session data + * + * @param Users $user + */ + private function registerSession(Users $user) + { + $this->session->set('auth', [ + 'id' => $user->id, + 'name' => $user->name, + ]); } } From 37886618cea4ed340e3bf0587e6e9afe8ce37121 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 16:57:00 +0000 Subject: [PATCH 006/118] #76 - Refactor of forms --- app/forms/CompaniesForm.php | 140 +++++++++++---------------------- app/forms/ContactForm.php | 60 ++++++-------- app/forms/ProductTypesForm.php | 29 +++---- app/forms/ProductsForm.php | 64 +++++++-------- app/forms/RegisterForm.php | 95 ++++++++++------------ 5 files changed, 152 insertions(+), 236 deletions(-) diff --git a/app/forms/CompaniesForm.php b/app/forms/CompaniesForm.php index f0cebf1c..2bb9fe16 100644 --- a/app/forms/CompaniesForm.php +++ b/app/forms/CompaniesForm.php @@ -12,116 +12,68 @@ class CompaniesForm extends Form { /** * Initialize the companies form + * + * @param null $entity + * @param array $options */ public function initialize($entity = null, array $options = []) { if (!isset($options['edit'])) { - $element = new Text("id"); - - $this->add( - $element->setLabel("Id") - ); + $this->add((new Text('id'))->setLabel('Id')); } else { - $this->add( - new Hidden("id") - ); + $this->add(new Hidden('id')); } - $name = new Text("name"); - - $name->setLabel("Name"); - - $name->setFilters( - [ - 'striptags', - 'string', - ] - ); - - $name->addValidators( - [ - new PresenceOf( - [ - 'message' => 'Name is required', - ] - ), - ] - ); + $commonFilters = [ + 'striptags', + 'string', + ]; + + /** + * Name text field + */ + $name = new Text('name'); + $name->setLabel('Name'); + $name->setFilters($commonFilters); + $name->addValidators([ + new PresenceOf(['message' => 'Name is required']), + ]); $this->add($name); - - - $telephone = new Text("telephone"); - - $telephone->setLabel("Telephone"); - - $telephone->setFilters( - [ - 'striptags', - 'string', - ] - ); - - $telephone->addValidators( - [ - new PresenceOf( - [ - 'message' => 'Telephone is required', - ] - ), - ] - ); + /** + * Telephone text field + */ + $telephone = new Text('telephone'); + $telephone->setLabel('Telephone'); + $telephone->setFilters($commonFilters); + $telephone->addValidators([ + new PresenceOf(['message' => 'Telephone is required']), + ]); $this->add($telephone); - - - $address = new Text("address"); - - $address->setLabel("address"); - - $address->setFilters( - [ - 'striptags', - 'string', - ] - ); - - $address->addValidators( - [ - new PresenceOf( - [ - 'message' => 'Address is required', - ] - ), - ] - ); + /** + * Address text field + */ + $address = new Text('address'); + $address->setLabel('address'); + $address->setFilters($commonFilters); + $address->addValidators([ + new PresenceOf(['message' => 'Address is required']), + ]); $this->add($address); - - - $city = new Text("city"); - - $city->setLabel("city"); - - $city->setFilters( - [ - 'striptags', - 'string', - ] - ); - - $city->addValidators( - [ - new PresenceOf( - [ - 'message' => 'City is required', - ] - ), - ] - ); + /** + * City text field + */ + $city = new Text('city'); + $city->setLabel('city'); + $city->setFilters($commonFilters); + $city->addValidators([ + new PresenceOf(['message' => 'City is required']), + ]); $this->add($city); } diff --git a/app/forms/ContactForm.php b/app/forms/ContactForm.php index 418e8c33..5fb3a782 100644 --- a/app/forms/ContactForm.php +++ b/app/forms/ContactForm.php @@ -11,55 +11,47 @@ class ContactForm extends Form { + /** + * @param null $entity + * @param array $options + */ public function initialize($entity = null, array $options = []) { - // Name + /** + * Name text field + */ $name = new Text('name'); $name->setLabel('Your Full Name'); $name->setFilters(['striptags', 'string']); - $name->addValidators( - [ - new PresenceOf( - [ - 'message' => 'Name is required', - ] - ), - ] - ); + $name->addValidators([ + new PresenceOf(['message' => 'Name is required']), + ]); + $this->add($name); - // Email + /** + * Email field + */ $email = new Text('email'); $email->setLabel('E-Mail'); $email->setFilters('email'); - $email->addValidators( - [ - new PresenceOf( - [ - 'message' => 'E-mail is required', - ] - ), - new Email( - [ - 'message' => 'E-mail is not valid', - ] - ) - ] - ); + $email->addValidators([ + new PresenceOf(['message' => 'E-mail is required']), + new Email(['message' => 'E-mail is not valid']) + ]); + $this->add($email); + /** + * Comment textarea + */ $comments = new TextArea('comments'); $comments->setLabel('Comments'); $comments->setFilters(['striptags', 'string']); - $comments->addValidators( - [ - new PresenceOf( - [ - 'message' => 'Comments is required', - ] - ), - ] - ); + $comments->addValidators([ + new PresenceOf(['message' => 'Comments is required']), + ]); + $this->add($comments); } } diff --git a/app/forms/ProductTypesForm.php b/app/forms/ProductTypesForm.php index 20d8fb5a..57a9e5d6 100644 --- a/app/forms/ProductTypesForm.php +++ b/app/forms/ProductTypesForm.php @@ -12,32 +12,25 @@ class ProductTypesForm extends Form { /** * Initialize the products form + * + * @param null $entity + * @param array $options */ public function initialize($entity = null, array $options = []) { if (!isset($options['edit'])) { - $element = new Text("id"); - $this->add( - $element->setLabel("Id") - ); + $this->add((new Text('id'))->setLabel('Id')); } else { - $this->add( - new Hidden("id") - ); + $this->add(new Hidden('id')); } - $name = new Text("name"); - $name->setLabel("Name"); + $name = new Text('name'); + $name->setLabel('Name'); $name->setFilters(['striptags', 'string']); - $name->addValidators( - [ - new PresenceOf( - [ - 'message' => 'Name is required', - ] - ), - ] - ); + $name->addValidators([ + new PresenceOf(['message' => 'Name is required']), + ]); + $this->add($name); } } diff --git a/app/forms/ProductsForm.php b/app/forms/ProductsForm.php index 2afdc5e1..6ed399a3 100644 --- a/app/forms/ProductsForm.php +++ b/app/forms/ProductsForm.php @@ -3,6 +3,7 @@ namespace Invo\Controllers; +use Invo\Models\ProductTypes; use Phalcon\Forms\Element\Hidden; use Phalcon\Forms\Element\Select; use Phalcon\Forms\Element\Text; @@ -14,35 +15,33 @@ class ProductsForm extends Form { /** * Initialize the products form + * + * @param null $entity + * @param array $options */ public function initialize($entity = null, array $options = []) { if (!isset($options['edit'])) { - $element = new Text("id"); - - $this->add( - $element->setLabel("Id") - ); + $this->add((new Text('id'))->setLabel('Id')); } else { - $this->add( - new Hidden("id") - ); + $this->add(new Hidden('id')); } - $name = new Text("name"); - $name->setLabel("Name"); + /** + * Name text field + */ + $name = new Text('name'); + $name->setLabel('Name'); $name->setFilters(['striptags', 'string']); - $name->addValidators( - [ - new PresenceOf( - [ - 'message' => 'Name is required', - ] - ), - ] - ); + $name->addValidators([ + new PresenceOf(['message' => 'Name is required']), + ]); + $this->add($name); + /** + * Product Type Id Select + */ $type = new Select( 'product_types_id', ProductTypes::find(), @@ -54,25 +53,20 @@ public function initialize($entity = null, array $options = []) ] ); $type->setLabel('Type'); + $this->add($type); - $price = new Text("price"); - $price->setLabel("Price"); + /** + * Price text field + */ + $price = new Text('price'); + $price->setLabel('Price'); $price->setFilters(['float']); - $price->addValidators( - [ - new PresenceOf( - [ - 'message' => 'Price is required', - ] - ), - new Numericality( - [ - 'message' => 'Price is required', - ] - ), - ] - ); + $price->addValidators([ + new PresenceOf(['message' => 'Price is required']), + new Numericality(['message' => 'Price is required']), + ]); + $this->add($price); } } diff --git a/app/forms/RegisterForm.php b/app/forms/RegisterForm.php index fef8bb30..38d518ce 100644 --- a/app/forms/RegisterForm.php +++ b/app/forms/RegisterForm.php @@ -11,84 +11,69 @@ class RegisterForm extends Form { + /** + * @param null $entity + * @param null $options + */ public function initialize($entity = null, $options = null) { - // Name + /** + * Name text field + */ $name = new Text('name'); $name->setLabel('Your Full Name'); $name->setFilters(['striptags', 'string']); - $name->addValidators( - [ - new PresenceOf( - [ - 'message' => 'Name is required', - ] - ), - ] - ); + $name->addValidators([ + new PresenceOf(['message' => 'Name is required']), + ]); + $this->add($name); - // Name + /** + * Username text field + */ $name = new Text('username'); $name->setLabel('Username'); $name->setFilters(['alpha']); - $name->addValidators( - [ - new PresenceOf( - [ - 'message' => 'Please enter your desired user name', - ] - ), - ] - ); + $name->addValidators([ + new PresenceOf(['message' => 'Please enter your desired user name']), + ]); + $this->add($name); - // Email + /** + * Email text field + */ $email = new Text('email'); $email->setLabel('E-Mail'); $email->setFilters('email'); - $email->addValidators( - [ - new PresenceOf( - [ - 'message' => 'E-mail is required', - ] - ), - new Email( - [ - 'message' => 'E-mail is not valid', - ] - ), - ] - ); + $email->addValidators([ + new PresenceOf(['message' => 'E-mail is required']), + new Email(['message' => 'E-mail is not valid']), + ]); + $this->add($email); - // Password + /** + * Password field + */ $password = new Password('password'); $password->setLabel('Password'); - $password->addValidators( - [ - new PresenceOf( - [ - 'message' => 'Password is required', - ] - ), - ] - ); + $password->addValidators([ + new PresenceOf(['message' => 'Password is required']), + ]); + $this->add($password); - // Confirm Password + /** + * Confirm Password field + */ $repeatPassword = new Password('repeatPassword'); $repeatPassword->setLabel('Repeat Password'); - $repeatPassword->addValidators( - [ - new PresenceOf( - [ - 'message' => 'Confirmation password is required', - ] - ), - ] - ); + $repeatPassword->addValidators([ + new PresenceOf(['message' => 'Confirmation password is required']), + ]); + $this->add($repeatPassword); } } From 3052d8abfa851cecbb4947fe27fc61fe0820c037 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 16:57:24 +0000 Subject: [PATCH 007/118] #76 - Update .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index cdf965e4..f69bddad 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,6 @@ Thumbs.db *.sublime-project *.sublime-workspace .idea/ +vendor/ +composer.lock +composer.phar From 9dc72b351a6c06c7b39218913ede5aed777fe168 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 17:23:52 +0000 Subject: [PATCH 008/118] #76 - Fix errors --- app/config/loader.php | 8 +++---- app/library/Elements.php | 19 ++++++++------- app/models/Products.php | 8 ++----- app/plugins/SecurityPlugin.php | 44 +++++++++++++--------------------- psalm.xml | 1 + public/index.php | 27 +++++---------------- 6 files changed, 39 insertions(+), 68 deletions(-) diff --git a/app/config/loader.php b/app/config/loader.php index 1b7317b5..b545424f 100644 --- a/app/config/loader.php +++ b/app/config/loader.php @@ -13,8 +13,6 @@ APP_PATH . $config->application->formsDir, ])->register(); -$loader->registerClasses( - [ - 'Services' => APP_PATH . 'app/Services.php', - ] -); +$loader->registerClasses([ + 'Services' => APP_PATH . 'app/Services.php', +]); diff --git a/app/library/Elements.php b/app/library/Elements.php index 5d5702dc..1ab27cc8 100644 --- a/app/library/Elements.php +++ b/app/library/Elements.php @@ -1,15 +1,18 @@ [ 'index' => [ 'caption' => 'Home', @@ -36,7 +39,7 @@ class Elements extends Component ] ]; - private $_tabs = [ + private $tabs = [ 'Invoices' => [ 'controller' => 'invoices', 'action' => 'index', @@ -73,16 +76,16 @@ public function getMenu() { $auth = $this->session->get('auth'); if ($auth) { - $this->_headerMenu['navbar-right']['session'] = [ + $this->headerMenu['navbar-right']['session'] = [ 'caption' => 'Log Out', 'action' => 'end' ]; } else { - unset($this->_headerMenu['navbar-left']['invoices']); + unset($this->headerMenu['navbar-left']['invoices']); } $controllerName = $this->view->getControllerName(); - foreach ($this->_headerMenu as $position => $menu) { + foreach ($this->headerMenu as $position => $menu) { echo '
    '; echo '
      '; @@ -115,7 +118,7 @@ public function getTabs() echo '
        '; - foreach ($this->_tabs as $caption => $option) { + foreach ($this->tabs as $caption => $option) { if ($option['controller'] == $controllerName && ($option['action'] == $actionName || $option['any'])) { echo '
      • '; } else { diff --git a/app/models/Products.php b/app/models/Products.php index abde4da3..c0d1c57b 100644 --- a/app/models/Products.php +++ b/app/models/Products.php @@ -55,12 +55,8 @@ public function initialize() * * @return string */ - public function getActiveDetail() + public function getActiveDetail(): string { - if ($this->active == 'Y') { - return 'Yes'; - } - - return 'No'; + return $this->active == 'Y' ? 'Yes' : 'No'; } } diff --git a/app/plugins/SecurityPlugin.php b/app/plugins/SecurityPlugin.php index 4a410778..569702f6 100644 --- a/app/plugins/SecurityPlugin.php +++ b/app/plugins/SecurityPlugin.php @@ -4,8 +4,9 @@ namespace Invo\Plugins; use Phalcon\Acl\Adapter\Memory as AclList; -use Phalcon\Acl\Resource; +use Phalcon\Acl\Component; use Phalcon\Acl\Role; +use Phalcon\Acl\Enum; use Phalcon\Di\Injectable; use Phalcon\Events\Event; use Phalcon\Mvc\Dispatcher; @@ -26,8 +27,7 @@ public function getAcl() { if (!isset($this->persistent->acl)) { $acl = new AclList(); - - $acl->setDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::DENY); // Register roles $roles = [ @@ -53,10 +53,7 @@ public function getAcl() 'invoices' => ['index', 'profile'], ]; foreach ($privateResources as $resource => $actions) { - $acl->addResource( - new Resource($resource), - $actions - ); + $acl->addComponent(new Component($resource), $actions); } //Public area resources @@ -69,21 +66,14 @@ public function getAcl() 'contact' => ['index', 'send'], ]; foreach ($publicResources as $resource => $actions) { - $acl->addResource( - new Resource($resource), - $actions - ); + $acl->addComponent(new Component($resource), $actions); } //Grant access to public areas to both users and guests foreach ($roles as $role) { foreach ($publicResources as $resource => $actions) { foreach ($actions as $action) { - $acl->allow( - $role->getName(), - $resource, - $action - ); + $acl->allow($role->getName(), $resource, $action); } } } @@ -124,28 +114,26 @@ public function beforeExecuteRoute(Event $event, Dispatcher $dispatcher) $acl = $this->getAcl(); if (!$acl->isResource($controller)) { - $dispatcher->forward( - [ - 'controller' => 'errors', - 'action' => 'show404', - ] - ); + $dispatcher->forward([ + 'controller' => 'errors', + 'action' => 'show404', + ]); return false; } $allowed = $acl->isAllowed($role, $controller, $action); if (!$allowed) { - $dispatcher->forward( - [ - 'controller' => 'errors', - 'action' => 'show401', - ] - ); + $dispatcher->forward([ + 'controller' => 'errors', + 'action' => 'show401', + ]); $this->session->destroy(); return false; } + + return true; } } diff --git a/psalm.xml b/psalm.xml index be2f3c92..f9f57b8d 100644 --- a/psalm.xml +++ b/psalm.xml @@ -8,6 +8,7 @@ > + diff --git a/public/index.php b/public/index.php index 82970678..a2dcab33 100644 --- a/public/index.php +++ b/public/index.php @@ -1,17 +1,12 @@ merge($override); } - - /** * Auto-loader configuration */ require APP_PATH . 'app/config/loader.php'; - $application = new Application( - new Services($config) - ); - - // NGINX - PHP-FPM already set PATH_INFO variable to handle route - $response = $application->handle( - !empty($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : null - ); - - $response->send(); -} catch (Exception $e){ + $application = new Application(new Services($config)); + $application->handle($_SERVER['REQUEST_URI'])->send(); +} catch (Exception $e) { echo $e->getMessage() . '
        '; echo '
        ' . $e->getTraceAsString() . '
        '; } From d39e437ec67edaf4b2418a4fd6d6c28e4076da64 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 21:35:22 +0000 Subject: [PATCH 009/118] #76 - Refactor in Controllers --- app/controllers/CompaniesController.php | 182 ++++++++++-------------- app/controllers/ProductsController.php | 16 +-- 2 files changed, 80 insertions(+), 118 deletions(-) diff --git a/app/controllers/CompaniesController.php b/app/controllers/CompaniesController.php index 229f4f0b..f76f8381 100644 --- a/app/controllers/CompaniesController.php +++ b/app/controllers/CompaniesController.php @@ -35,13 +35,13 @@ public function searchAction() if ($this->request->isPost()) { $query = Criteria::fromInput( $this->di, - "Companies", + 'Companies', $this->request->getPost() ); $this->persistent->searchParams = $query->getParams(); } else { - $numberPage = $this->request->getQuery("page", "int"); + $numberPage = $this->request->getQuery('page', 'int'); } $parameters = []; @@ -51,23 +51,19 @@ public function searchAction() $companies = Companies::find($parameters); if (count($companies) == 0) { - $this->flash->notice("The search did not find any companies"); + $this->flash->notice('The search did not find any companies'); - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'companies', + 'action' => 'index', + ]); } - $paginator = new Paginator( - [ - "data" => $companies, - "limit" => 10, - "page" => $numberPage, - ] - ); + $paginator = new Paginator([ + 'data' => $companies, + 'limit' => 10, + 'page' => $numberPage, + ]); $this->view->page = $paginator->getPaginate(); $this->view->companies = $companies; @@ -92,12 +88,10 @@ public function editAction($id) if (!$company) { $this->flash->error('Company was not found'); - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'companies', + 'action' => 'index', + ]); } $this->view->form = new CompaniesForm($company, ['edit' => true]); @@ -109,12 +103,10 @@ public function editAction($id) public function createAction() { if (!$this->request->isPost()) { - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'companies', + 'action' => 'index', + ]); } $form = new CompaniesForm; @@ -126,109 +118,88 @@ public function createAction() $this->flash->error($message); } - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "new", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'companies', + 'action' => 'new', + ]); } - if ($company->save() == false) { + if (!$company->save()) { foreach ($company->getMessages() as $message) { $this->flash->error((string)$message); } - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "new", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'companies', + 'action' => 'new', + ]); } $form->clear(); - $this->flash->success("Company was created successfully"); + $this->flash->success('Company was created successfully'); - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'companies', + 'action' => 'index', + ]); } /** * Saves current company in screen - * - * @param string $id */ public function saveAction() { if (!$this->request->isPost()) { - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'companies', + 'action' => 'index', + ]); } - $id = $this->request->getPost("id", "int"); - + $id = $this->request->getPost('id', 'int'); $company = Companies::findFirstById($id); - if (!$company) { - $this->flash->error("Company does not exist"); + $this->flash->error('Company does not exist'); - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'companies', + 'action' => 'index', + ]); } - $form = new CompaniesForm; - $data = $this->request->getPost(); + $form = new CompaniesForm; if (!$form->isValid($data, $company)) { foreach ($form->getMessages() as $message) { $this->flash->error($message); } - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "new", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'companies', + 'action' => 'new', + ]); } - if ($company->save() == false) { + if (!$company->save()) { foreach ($company->getMessages() as $message) { $this->flash->error($message); } - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "new", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'companies', + 'action' => 'new', + ]); } $form->clear(); - $this->flash->success("Company was updated successfully"); + $this->flash->success('Company was updated successfully'); - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'companies', + 'action' => 'index', + ]); } /** @@ -239,16 +210,13 @@ public function saveAction() public function deleteAction($id) { $companies = Companies::findFirstById($id); - if (!$companies) { - $this->flash->error("Company was not found"); + $this->flash->error('Company was not found'); - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'companies', + 'action' => 'index', + ]); } if (!$companies->delete()) { @@ -256,21 +224,17 @@ public function deleteAction($id) $this->flash->error($message); } - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "search", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'companies', + 'action' => 'search', + ]); } - $this->flash->success("Company was deleted"); + $this->flash->success('Company was deleted'); - return $this->dispatcher->forward( - [ - "controller" => "companies", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'companies', + 'action' => 'index', + ]); } } diff --git a/app/controllers/ProductsController.php b/app/controllers/ProductsController.php index c4b540c4..c05e5481 100644 --- a/app/controllers/ProductsController.php +++ b/app/controllers/ProductsController.php @@ -39,13 +39,13 @@ public function searchAction() if ($this->request->isPost()) { $query = Criteria::fromInput( $this->di, - "Products", + 'Products', $this->request->getPost() ); $this->persistent->searchParams = $query->getParams(); } else { - $numberPage = $this->request->getQuery("page", "int"); + $numberPage = $this->request->getQuery('page', 'int'); } $parameters = []; @@ -55,7 +55,7 @@ public function searchAction() $products = Products::find($parameters); if (count($products) == 0) { - $this->flash->notice("The search did not find any products"); + $this->flash->notice('The search did not find any products'); return $this->dispatcher->forward([ 'controller' => 'products', @@ -106,12 +106,10 @@ public function editAction($id): void public function createAction() { if (!$this->request->isPost()) { - return $this->dispatcher->forward( - [ - "controller" => "products", - "action" => "index", - ] - ); + return $this->dispatcher->forward([ + 'controller' => 'products', + 'action' => 'index', + ]); } $form = new ProductsForm; From 148f3a190c87d37afefbac1913546d2614212dff Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 21:35:55 +0000 Subject: [PATCH 010/118] #76 - Remove config loader.php --- app/config/loader.php | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 app/config/loader.php diff --git a/app/config/loader.php b/app/config/loader.php deleted file mode 100644 index b545424f..00000000 --- a/app/config/loader.php +++ /dev/null @@ -1,18 +0,0 @@ -registerDirs([ - APP_PATH . $config->application->controllersDir, - APP_PATH . $config->application->pluginsDir, - APP_PATH . $config->application->libraryDir, - APP_PATH . $config->application->modelsDir, - APP_PATH . $config->application->formsDir, -])->register(); - -$loader->registerClasses([ - 'Services' => APP_PATH . 'app/Services.php', -]); From eaa51552f96113d7d1929dea1ebca7f91b60912a Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 21:37:03 +0000 Subject: [PATCH 011/118] #76 - Separate service providers registration into separate classes in providers/ dir --- app/Services.php | 133 --------------------------- app/config/providers.php | 13 +++ app/library/Base/Services.php | 45 --------- app/providers/ConfigProvider.php | 31 +++++++ app/providers/DatabaseProvider.php | 24 +++++ app/providers/DispatcherProvider.php | 39 ++++++++ app/providers/ElementsProvider.php | 21 +++++ app/providers/FlashProvider.php | 29 ++++++ app/providers/SessionProvider.php | 22 +++++ app/providers/UrlProvider.php | 25 +++++ app/providers/ViewProvider.php | 26 ++++++ app/providers/VoltProvider.php | 28 ++++++ public/index.php | 33 +++---- 13 files changed, 273 insertions(+), 196 deletions(-) delete mode 100644 app/Services.php create mode 100644 app/config/providers.php delete mode 100644 app/library/Base/Services.php create mode 100644 app/providers/ConfigProvider.php create mode 100644 app/providers/DatabaseProvider.php create mode 100644 app/providers/DispatcherProvider.php create mode 100644 app/providers/ElementsProvider.php create mode 100644 app/providers/FlashProvider.php create mode 100644 app/providers/SessionProvider.php create mode 100644 app/providers/UrlProvider.php create mode 100644 app/providers/ViewProvider.php create mode 100644 app/providers/VoltProvider.php diff --git a/app/Services.php b/app/Services.php deleted file mode 100644 index c0add24c..00000000 --- a/app/Services.php +++ /dev/null @@ -1,133 +0,0 @@ -attach('dispatch:beforeExecuteRoute', new SecurityPlugin); - - /** - * Handle exceptions and not-found exceptions using NotFoundPlugin - */ - $eventsManager->attach('dispatch:beforeException', new NotFoundPlugin); - - $dispatcher = new Dispatcher; - $dispatcher->setEventsManager($eventsManager); - - return $dispatcher; - } - - /** - * The URL component is used to generate all kind of urls in the application - */ - protected function initUrl() - { - $url = new UrlProvider(); - $url->setBaseUri($this->get('config')->application->baseUri); - return $url; - } - - protected function initView() - { - $view = new View(); - - $view->setViewsDir(APP_PATH . $this->get('config')->application->viewsDir); - - $view->registerEngines([ - ".volt" => 'volt' - ]); - - return $view; - } - - /** - * Setting up volt - */ - protected function initSharedVolt($view, $di) - { - $volt = new VoltEngine($view, $di); - - $volt->setOptions([ - "compiledPath" => APP_PATH . "cache/volt/" - ]); - - $compiler = $volt->getCompiler(); - $compiler->addFunction('is_a', 'is_a'); - - return $volt; - } - - /** - * Database connection is created based in the parameters defined in the configuration file - */ - protected function initSharedDb() - { - $config = $this->get('config')->get('database')->toArray(); - - $dbClass = 'Phalcon\Db\Adapter\Pdo\\' . $config['adapter']; - unset($config['adapter']); - - return new $dbClass($config); - } - - /** - * If the configuration specify the use of metadata adapter use it or use memory otherwise - */ - protected function initModelsMetadata() - { - return new MetaData(); - } - - /** - * Start the session the first time some component request the session service - */ - protected function initSession() - { - $session = new SessionAdapter(); - $session->start(); - return $session; - } - - /** - * Register the flash service with custom CSS classes - */ - protected function initFlash() - { - return new FlashSession([ - 'error' => 'alert alert-danger', - 'success' => 'alert alert-success', - 'notice' => 'alert alert-info', - 'warning' => 'alert alert-warning' - ]); - } - - /** - * Register a user component - */ - protected function initElements() - { - return new Elements(); - } -} diff --git a/app/config/providers.php b/app/config/providers.php new file mode 100644 index 00000000..3be1bc44 --- /dev/null +++ b/app/config/providers.php @@ -0,0 +1,13 @@ +setShared('config', $config); - - $this->bindServices(); - } - - protected function bindServices() - { - $reflection = new \ReflectionObject($this); - - $methods = $reflection->getMethods(); - - foreach ($methods as $method) { - if ((strlen($method->name) > 10) && (strpos($method->name, 'initShared') === 0)) { - $this->setShared( - lcfirst( - substr($method->name, 10) - ), - $method->getClosure($this) - ); - - continue; - } - - if ((strlen($method->name) > 4) && (strpos($method->name, 'init') === 0)) { - $this->set( - lcfirst( - substr($method->name, 4) - ), - $method->getClosure($this) - ); - } - } - } -} diff --git a/app/providers/ConfigProvider.php b/app/providers/ConfigProvider.php new file mode 100644 index 00000000..76091fbc --- /dev/null +++ b/app/providers/ConfigProvider.php @@ -0,0 +1,31 @@ +setShared('config', function () { + $config = new ConfigIni(APP_PATH . 'app/config/config.ini'); + + if (is_readable(APP_PATH . 'app/config/config.ini.dev')) { + $override = new ConfigIni( + APP_PATH . 'app/config/config.ini.dev' + ); + + $config->merge($override); + } + + return $config; + }); + } +} diff --git a/app/providers/DatabaseProvider.php b/app/providers/DatabaseProvider.php new file mode 100644 index 00000000..400a4702 --- /dev/null +++ b/app/providers/DatabaseProvider.php @@ -0,0 +1,24 @@ +getShared('config')->get('database')->toArray(); + $di->setShared('db', function () use ($dbConfig) { + $dbClass = 'Phalcon\Db\Adapter\Pdo\\' . $dbConfig['adapter']; + unset($dbClass['adapter']); + + return new $dbClass($dbClass); + }); + } +} diff --git a/app/providers/DispatcherProvider.php b/app/providers/DispatcherProvider.php new file mode 100644 index 00000000..6290a1d9 --- /dev/null +++ b/app/providers/DispatcherProvider.php @@ -0,0 +1,39 @@ +setShared('dispatcher', function () { + $eventsManager = new EventsManager; + + /** + * Check if the user is allowed to access certain action using the SecurityPlugin + */ + $eventsManager->attach('dispatch:beforeExecuteRoute', new SecurityPlugin); + + /** + * Handle exceptions and not-found exceptions using NotFoundPlugin + */ + $eventsManager->attach('dispatch:beforeException', new NotFoundPlugin); + + $dispatcher = new Dispatcher; + $dispatcher->setEventsManager($eventsManager); + + return $dispatcher; + }); + } +} diff --git a/app/providers/ElementsProvider.php b/app/providers/ElementsProvider.php new file mode 100644 index 00000000..1345428e --- /dev/null +++ b/app/providers/ElementsProvider.php @@ -0,0 +1,21 @@ +setShared('elements', function () { + return new ElementsPlugin(); + }); + } +} diff --git a/app/providers/FlashProvider.php b/app/providers/FlashProvider.php new file mode 100644 index 00000000..76c508f6 --- /dev/null +++ b/app/providers/FlashProvider.php @@ -0,0 +1,29 @@ +setShared('flash', function () { + $flash = new FlashSession(); + $flash->setCssClasses([ + 'error' => 'alert alert-danger', + 'success' => 'alert alert-success', + 'notice' => 'alert alert-info', + 'warning' => 'alert alert-warning' + ]); + + return $flash; + }); + } +} diff --git a/app/providers/SessionProvider.php b/app/providers/SessionProvider.php new file mode 100644 index 00000000..e6a42be8 --- /dev/null +++ b/app/providers/SessionProvider.php @@ -0,0 +1,22 @@ +setShared('session', function () { + $session = new SessionAdapter(); + $session->start(); + return $session; + }); + } +} diff --git a/app/providers/UrlProvider.php b/app/providers/UrlProvider.php new file mode 100644 index 00000000..aaf1b359 --- /dev/null +++ b/app/providers/UrlProvider.php @@ -0,0 +1,25 @@ +getShared('config')->application->baseUri; + $di->setShared('db', function () use ($baseUri) { + $url = new Url(); + $url->setBaseUri($baseUri); + + return $url; + }); + } +} diff --git a/app/providers/ViewProvider.php b/app/providers/ViewProvider.php new file mode 100644 index 00000000..5db05f4d --- /dev/null +++ b/app/providers/ViewProvider.php @@ -0,0 +1,26 @@ +getShared('config')->application->viewsDir; + + $di->setShared('view', function () use ($viewsDir) { + $view = new View(); + $view->setViewsDir($viewsDir); + $view->registerEngines([ + '.volt' => 'volt' + ]); + + return $view; + }); + } +} diff --git a/app/providers/VoltProvider.php b/app/providers/VoltProvider.php new file mode 100644 index 00000000..423a5289 --- /dev/null +++ b/app/providers/VoltProvider.php @@ -0,0 +1,28 @@ +getShared('view'); + + $di->setShared('volt', function () use ($view, $di) { + $volt = new VoltEngine($view, $di); + $volt->setOptions([ + 'compiledPath' => APP_PATH . 'cache/volt/', + ]); + + $compiler = $volt->getCompiler(); + $compiler->addFunction('is_a', 'is_a'); + + return $volt; + }); + } +} diff --git a/public/index.php b/public/index.php index a2dcab33..ce8b3067 100644 --- a/public/index.php +++ b/public/index.php @@ -1,33 +1,30 @@ merge($override); + $providersConfig = APP_PATH . '/app/config/providers.php'; + if (!file_exists($providersConfig) || !is_readable($providersConfig)) { + throw new Exception('File providers.php does not exist or is not readable.'); } - /** - * Auto-loader configuration - */ - require APP_PATH . 'app/config/loader.php'; + $providers = include_once $providersConfig; + foreach ($providers as $providerClass) { + /** @var ServiceProviderInterface $provider */ + $provider = new $providerClass; + $provider->register($di); + } - $application = new Application(new Services($config)); - $application->handle($_SERVER['REQUEST_URI'])->send(); + (new Application($di)) + ->handle($_SERVER['REQUEST_URI']) + ->send(); } catch (Exception $e) { echo $e->getMessage() . '
        '; echo '
        ' . $e->getTraceAsString() . '
        '; From 4c45ffc807a647000b0d0c630ab37973e90c8c21 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 21:37:28 +0000 Subject: [PATCH 012/118] #76 - Move Elements class into plugins/ dir --- app/{library/Elements.php => plugins/ElementsPlugin.php} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename app/{library/Elements.php => plugins/ElementsPlugin.php} (98%) diff --git a/app/library/Elements.php b/app/plugins/ElementsPlugin.php similarity index 98% rename from app/library/Elements.php rename to app/plugins/ElementsPlugin.php index 1ab27cc8..d96e8981 100644 --- a/app/library/Elements.php +++ b/app/plugins/ElementsPlugin.php @@ -1,7 +1,7 @@ [ From a6aad8d7a44f97e5a98da21a52451e5b6808452e Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 21:44:38 +0000 Subject: [PATCH 013/118] #76 - Fix registration of SessionProvider --- app/providers/SessionProvider.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/providers/SessionProvider.php b/app/providers/SessionProvider.php index e6a42be8..417fbb9d 100644 --- a/app/providers/SessionProvider.php +++ b/app/providers/SessionProvider.php @@ -5,6 +5,8 @@ use Phalcon\Di\DiInterface; use Phalcon\Di\ServiceProviderInterface; +use Phalcon\Session\Adapter\Stream as SessionAdapter; +use Phalcon\Session\Manager as SessionManager; /** * Start the session the first time some component request the session service @@ -14,8 +16,12 @@ final class SessionProvider implements ServiceProviderInterface public function register(DiInterface $di) { $di->setShared('session', function () { - $session = new SessionAdapter(); - $session->start(); + $session = new SessionManager(); + $files = new SessionAdapter([ + 'savePath' => sys_get_temp_dir(), + ]); + $session->setAdapter($files); + return $session; }); } From 088c8f68895fbd24574411d63ccc3ee1ce439d8a Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 22:05:29 +0000 Subject: [PATCH 014/118] #76 - Refactor Plugins --- app/plugins/ElementsPlugin.php | 12 ++++++++---- app/plugins/NotFoundPlugin.php | 29 ++++++++++++----------------- app/plugins/SecurityPlugin.php | 2 +- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/app/plugins/ElementsPlugin.php b/app/plugins/ElementsPlugin.php index d96e8981..7be2d96a 100644 --- a/app/plugins/ElementsPlugin.php +++ b/app/plugins/ElementsPlugin.php @@ -12,6 +12,9 @@ */ class ElementsPlugin extends Injectable { + /** + * @var array + */ private $headerMenu = [ 'navbar-left' => [ 'index' => [ @@ -39,6 +42,9 @@ class ElementsPlugin extends Injectable ] ]; + /** + * @var array + */ private $tabs = [ 'Invoices' => [ 'controller' => 'invoices', @@ -69,10 +75,8 @@ class ElementsPlugin extends Injectable /** * Builds header menu with left and right items - * - * @return string */ - public function getMenu() + public function getMenu(): void { $auth = $this->session->get('auth'); if ($auth) { @@ -111,7 +115,7 @@ public function getMenu() /** * Returns menu tabs */ - public function getTabs() + public function getTabs(): void { $controllerName = $this->view->getControllerName(); $actionName = $this->view->getActionName(); diff --git a/app/plugins/NotFoundPlugin.php b/app/plugins/NotFoundPlugin.php index 6a008754..27097e23 100644 --- a/app/plugins/NotFoundPlugin.php +++ b/app/plugins/NotFoundPlugin.php @@ -26,30 +26,25 @@ class NotFoundPlugin extends Injectable */ public function beforeException(Event $event, MvcDispatcher $dispatcher, Exception $exception) { - error_log( - $exception->getMessage() . PHP_EOL . $exception->getTraceAsString() - ); + error_log($exception->getMessage() . PHP_EOL . $exception->getTraceAsString()); if ($exception instanceof DispatcherException) { switch ($exception->getCode()) { - case MvcDispatcher::EXCEPTION_HANDLER_NOT_FOUND: - case MvcDispatcher::EXCEPTION_ACTION_NOT_FOUND: - $dispatcher->forward( - [ - 'controller' => 'errors', - 'action' => 'show404', - ] - ); + case DispatcherException::EXCEPTION_HANDLER_NOT_FOUND: + case DispatcherException::EXCEPTION_ACTION_NOT_FOUND: + $dispatcher->forward([ + 'controller' => 'errors', + 'action' => 'show404', + ]); + return false; } } - $dispatcher->forward( - [ - 'controller' => 'errors', - 'action' => 'show500', - ] - ); + $dispatcher->forward([ + 'controller' => 'errors', + 'action' => 'show500', + ]); return false; } diff --git a/app/plugins/SecurityPlugin.php b/app/plugins/SecurityPlugin.php index 569702f6..f111768d 100644 --- a/app/plugins/SecurityPlugin.php +++ b/app/plugins/SecurityPlugin.php @@ -33,7 +33,7 @@ public function getAcl() $roles = [ 'users' => new Role( 'Users', - 'Member privileges, granted after sign in.', + 'Member privileges, granted after sign in.' ), 'guests' => new Role( 'Guests', From 78a01f0c1635475743d6cecd857a17884e28e811 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 22:06:01 +0000 Subject: [PATCH 015/118] #76 - Change method name from getPaginate() to paginate() --- app/controllers/CompaniesController.php | 2 +- app/controllers/ProductsController.php | 2 +- app/controllers/ProducttypesController.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/CompaniesController.php b/app/controllers/CompaniesController.php index f76f8381..cb6da9dc 100644 --- a/app/controllers/CompaniesController.php +++ b/app/controllers/CompaniesController.php @@ -65,7 +65,7 @@ public function searchAction() 'page' => $numberPage, ]); - $this->view->page = $paginator->getPaginate(); + $this->view->page = $paginator->paginate(); $this->view->companies = $companies; } diff --git a/app/controllers/ProductsController.php b/app/controllers/ProductsController.php index c05e5481..23a8ade9 100644 --- a/app/controllers/ProductsController.php +++ b/app/controllers/ProductsController.php @@ -69,7 +69,7 @@ public function searchAction() 'page' => $numberPage, ]); - $this->view->page = $paginator->getPaginate(); + $this->view->page = $paginator->paginate(); } /** diff --git a/app/controllers/ProducttypesController.php b/app/controllers/ProducttypesController.php index a4ed4002..9eb8fa79 100644 --- a/app/controllers/ProducttypesController.php +++ b/app/controllers/ProducttypesController.php @@ -70,7 +70,7 @@ public function searchAction() 'page' => $numberPage, ]); - $this->view->page = $paginator->getPaginate(); + $this->view->page = $paginator->paginate(); $this->view->productTypes = $productTypes; } From 9d2d8de2fe1dfb6812fff1954ca9196443cb5df5 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 23 Nov 2019 22:06:31 +0000 Subject: [PATCH 016/118] #76 - Change providers registration to use loadFromPhp() --- app/config/providers.php | 45 ++++++++++++++++++++++++++++++++-------- public/index.php | 12 +++-------- 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/app/config/providers.php b/app/config/providers.php index 3be1bc44..c52c3f96 100644 --- a/app/config/providers.php +++ b/app/config/providers.php @@ -1,13 +1,40 @@ [ + 'className' => \Invo\Providers\ConfigProvider::class, + 'shared' => true, + ], + 'db' => [ + 'className' => \Invo\Providers\DatabaseProvider::class, + 'shared' => true, + ], + 'dispatcher' => [ + 'className' => \Invo\Providers\DispatcherProvider::class, + 'shared' => true, + ], + 'elements' => [ + 'className' => \Invo\Providers\ElementsProvider::class, + 'shared' => true, + ], + 'flash' => [ + 'className' => \Invo\Providers\FlashProvider::class, + 'shared' => true, + ], + 'session' => [ + 'className' => \Invo\Providers\SessionProvider::class, + 'shared' => true, + ], + 'url' => [ + 'className' => \Invo\Providers\UrlProvider::class, + 'shared' => true, + ], + 'view' => [ + 'className' => \Invo\Providers\ViewProvider::class, + 'shared' => true, + ], + 'volt' => [ + 'className' => \Invo\Providers\VoltProvider::class, + 'shared' => true, + ], ]; diff --git a/public/index.php b/public/index.php index ce8b3067..cf79696a 100644 --- a/public/index.php +++ b/public/index.php @@ -2,7 +2,6 @@ declare(strict_types=1); use Phalcon\Di\FactoryDefault; -use Phalcon\Di\ServiceProviderInterface; use Phalcon\Mvc\Application; try { @@ -10,17 +9,12 @@ $di = new FactoryDefault(); - $providersConfig = APP_PATH . '/app/config/providers.php'; - if (!file_exists($providersConfig) || !is_readable($providersConfig)) { + $providers = APP_PATH . '/app/config/providers.php'; + if (!file_exists($providers) || !is_readable($providers)) { throw new Exception('File providers.php does not exist or is not readable.'); } - $providers = include_once $providersConfig; - foreach ($providers as $providerClass) { - /** @var ServiceProviderInterface $provider */ - $provider = new $providerClass; - $provider->register($di); - } + $di->loadFromPhp($providers); (new Application($di)) ->handle($_SERVER['REQUEST_URI']) From 0a64adb07d8027035e692e79450b818db22b17c8 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 24 Nov 2019 13:28:36 +0000 Subject: [PATCH 017/118] #76 - Replace APP_PATH constant to Di offset --- app/providers/ConfigProvider.php | 12 +++++------- app/providers/ViewProvider.php | 2 +- app/providers/VoltProvider.php | 2 +- public/index.php | 5 +++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/providers/ConfigProvider.php b/app/providers/ConfigProvider.php index 76091fbc..441825a4 100644 --- a/app/providers/ConfigProvider.php +++ b/app/providers/ConfigProvider.php @@ -14,14 +14,12 @@ final class ConfigProvider implements ServiceProviderInterface { public function register(DiInterface $di) { - $di->setShared('config', function () { - $config = new ConfigIni(APP_PATH . 'app/config/config.ini'); - - if (is_readable(APP_PATH . 'app/config/config.ini.dev')) { - $override = new ConfigIni( - APP_PATH . 'app/config/config.ini.dev' - ); + $rootPath = $di->offsetGet('rootPath'); + $di->setShared('config', function () use ($rootPath) { + $config = new ConfigIni($rootPath . '/app/config/config.ini'); + if (is_readable($rootPath . '/app/config/config.ini.dev')) { + $override = new ConfigIni($rootPath . 'app/config/config.ini.dev'); $config->merge($override); } diff --git a/app/providers/ViewProvider.php b/app/providers/ViewProvider.php index 5db05f4d..4a8ef3aa 100644 --- a/app/providers/ViewProvider.php +++ b/app/providers/ViewProvider.php @@ -11,7 +11,7 @@ final class ViewProvider implements ServiceProviderInterface { public function register(DiInterface $di) { - $viewsDir = APP_PATH . $di->getShared('config')->application->viewsDir; + $viewsDir = $di->offsetGet('rootPath') . $di->getShared('config')->application->viewsDir; $di->setShared('view', function () use ($viewsDir) { $view = new View(); diff --git a/app/providers/VoltProvider.php b/app/providers/VoltProvider.php index 423a5289..90ce6157 100644 --- a/app/providers/VoltProvider.php +++ b/app/providers/VoltProvider.php @@ -16,7 +16,7 @@ public function register(DiInterface $di) $di->setShared('volt', function () use ($view, $di) { $volt = new VoltEngine($view, $di); $volt->setOptions([ - 'compiledPath' => APP_PATH . 'cache/volt/', + 'compiledPath' => $di->offsetGet('rootPath') . '/cache/volt/', ]); $compiler = $volt->getCompiler(); diff --git a/public/index.php b/public/index.php index cf79696a..bead3faf 100644 --- a/public/index.php +++ b/public/index.php @@ -5,11 +5,12 @@ use Phalcon\Mvc\Application; try { - define('APP_PATH', realpath('..') . '/'); + $rootPath = realpath('..'); $di = new FactoryDefault(); + $di->offsetSet('rootPath', $rootPath); - $providers = APP_PATH . '/app/config/providers.php'; + $providers = $rootPath . '/app/config/providers.php'; if (!file_exists($providers) || !is_readable($providers)) { throw new Exception('File providers.php does not exist or is not readable.'); } From cf0669a4c6a841148fd707293b6917c1bec33ad7 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 18:53:46 +0000 Subject: [PATCH 018/118] #76 - Rename app/ to src/ directory --- composer.json | 9 ++++++--- public/index.php | 2 +- schemas/createdb.php | 2 +- {app => src}/config/config.ini | 0 {app => src}/config/providers.php | 0 {app => src}/controllers/AboutController.php | 0 {app => src}/controllers/CompaniesController.php | 0 {app => src}/controllers/ContactController.php | 0 {app => src}/controllers/ControllerBase.php | 0 {app => src}/controllers/ErrorsController.php | 0 {app => src}/controllers/IndexController.php | 0 {app => src}/controllers/InvoicesController.php | 0 {app => src}/controllers/ProductsController.php | 0 {app => src}/controllers/ProducttypesController.php | 0 {app => src}/controllers/RegisterController.php | 0 {app => src}/controllers/SessionController.php | 0 {app => src}/forms/CompaniesForm.php | 0 {app => src}/forms/ContactForm.php | 0 {app => src}/forms/ProductTypesForm.php | 0 {app => src}/forms/ProductsForm.php | 0 {app => src}/forms/RegisterForm.php | 0 {app => src}/logs/.gitignore | 0 {app => src}/models/Companies.php | 0 {app => src}/models/Contact.php | 0 {app => src}/models/ProductTypes.php | 0 {app => src}/models/Products.php | 0 {app => src}/models/Users.php | 0 {app => src}/plugins/ElementsPlugin.php | 0 {app => src}/plugins/NotFoundPlugin.php | 0 {app => src}/plugins/SecurityPlugin.php | 0 {app => src}/providers/ConfigProvider.php | 6 +++--- {app => src}/providers/DatabaseProvider.php | 0 {app => src}/providers/DispatcherProvider.php | 0 {app => src}/providers/ElementsProvider.php | 0 {app => src}/providers/FlashProvider.php | 0 {app => src}/providers/SessionProvider.php | 0 {app => src}/providers/UrlProvider.php | 0 {app => src}/providers/ViewProvider.php | 0 {app => src}/providers/VoltProvider.php | 0 {app => src}/views/about/index.volt | 0 {app => src}/views/companies/edit.volt | 0 {app => src}/views/companies/index.volt | 0 {app => src}/views/companies/new.volt | 0 {app => src}/views/companies/search.volt | 0 {app => src}/views/contact/index.volt | 0 {app => src}/views/errors/show401.volt | 0 {app => src}/views/errors/show404.volt | 0 {app => src}/views/errors/show500.volt | 0 {app => src}/views/index.volt | 0 {app => src}/views/index/index.volt | 0 {app => src}/views/invoices/index.volt | 0 {app => src}/views/invoices/profile.volt | 0 {app => src}/views/layouts/about.volt | 0 {app => src}/views/layouts/companies.volt | 0 {app => src}/views/layouts/contact.volt | 0 {app => src}/views/layouts/errors.volt | 0 {app => src}/views/layouts/index.volt | 0 {app => src}/views/layouts/invoices.volt | 0 {app => src}/views/layouts/main.volt | 0 {app => src}/views/layouts/products.volt | 0 {app => src}/views/layouts/producttypes.volt | 0 {app => src}/views/layouts/register.volt | 0 {app => src}/views/layouts/session.volt | 0 {app => src}/views/products/edit.volt | 0 {app => src}/views/products/index.volt | 0 {app => src}/views/products/new.volt | 0 {app => src}/views/products/search.volt | 0 {app => src}/views/producttypes/edit.volt | 0 {app => src}/views/producttypes/index.volt | 0 {app => src}/views/producttypes/new.volt | 0 {app => src}/views/producttypes/search.volt | 0 {app => src}/views/register/index.volt | 0 {app => src}/views/session/index.volt | 0 73 files changed, 11 insertions(+), 8 deletions(-) rename {app => src}/config/config.ini (100%) rename {app => src}/config/providers.php (100%) rename {app => src}/controllers/AboutController.php (100%) rename {app => src}/controllers/CompaniesController.php (100%) rename {app => src}/controllers/ContactController.php (100%) rename {app => src}/controllers/ControllerBase.php (100%) rename {app => src}/controllers/ErrorsController.php (100%) rename {app => src}/controllers/IndexController.php (100%) rename {app => src}/controllers/InvoicesController.php (100%) rename {app => src}/controllers/ProductsController.php (100%) rename {app => src}/controllers/ProducttypesController.php (100%) rename {app => src}/controllers/RegisterController.php (100%) rename {app => src}/controllers/SessionController.php (100%) rename {app => src}/forms/CompaniesForm.php (100%) rename {app => src}/forms/ContactForm.php (100%) rename {app => src}/forms/ProductTypesForm.php (100%) rename {app => src}/forms/ProductsForm.php (100%) rename {app => src}/forms/RegisterForm.php (100%) rename {app => src}/logs/.gitignore (100%) rename {app => src}/models/Companies.php (100%) rename {app => src}/models/Contact.php (100%) rename {app => src}/models/ProductTypes.php (100%) rename {app => src}/models/Products.php (100%) rename {app => src}/models/Users.php (100%) rename {app => src}/plugins/ElementsPlugin.php (100%) rename {app => src}/plugins/NotFoundPlugin.php (100%) rename {app => src}/plugins/SecurityPlugin.php (100%) rename {app => src}/providers/ConfigProvider.php (72%) rename {app => src}/providers/DatabaseProvider.php (100%) rename {app => src}/providers/DispatcherProvider.php (100%) rename {app => src}/providers/ElementsProvider.php (100%) rename {app => src}/providers/FlashProvider.php (100%) rename {app => src}/providers/SessionProvider.php (100%) rename {app => src}/providers/UrlProvider.php (100%) rename {app => src}/providers/ViewProvider.php (100%) rename {app => src}/providers/VoltProvider.php (100%) rename {app => src}/views/about/index.volt (100%) rename {app => src}/views/companies/edit.volt (100%) rename {app => src}/views/companies/index.volt (100%) rename {app => src}/views/companies/new.volt (100%) rename {app => src}/views/companies/search.volt (100%) rename {app => src}/views/contact/index.volt (100%) rename {app => src}/views/errors/show401.volt (100%) rename {app => src}/views/errors/show404.volt (100%) rename {app => src}/views/errors/show500.volt (100%) rename {app => src}/views/index.volt (100%) rename {app => src}/views/index/index.volt (100%) rename {app => src}/views/invoices/index.volt (100%) rename {app => src}/views/invoices/profile.volt (100%) rename {app => src}/views/layouts/about.volt (100%) rename {app => src}/views/layouts/companies.volt (100%) rename {app => src}/views/layouts/contact.volt (100%) rename {app => src}/views/layouts/errors.volt (100%) rename {app => src}/views/layouts/index.volt (100%) rename {app => src}/views/layouts/invoices.volt (100%) rename {app => src}/views/layouts/main.volt (100%) rename {app => src}/views/layouts/products.volt (100%) rename {app => src}/views/layouts/producttypes.volt (100%) rename {app => src}/views/layouts/register.volt (100%) rename {app => src}/views/layouts/session.volt (100%) rename {app => src}/views/products/edit.volt (100%) rename {app => src}/views/products/index.volt (100%) rename {app => src}/views/products/new.volt (100%) rename {app => src}/views/products/search.volt (100%) rename {app => src}/views/producttypes/edit.volt (100%) rename {app => src}/views/producttypes/index.volt (100%) rename {app => src}/views/producttypes/new.volt (100%) rename {app => src}/views/producttypes/search.volt (100%) rename {app => src}/views/register/index.volt (100%) rename {app => src}/views/session/index.volt (100%) diff --git a/composer.json b/composer.json index ae4fcb41..ebfc9c01 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,8 @@ ], "require": { "php": ">=7.2", - "ext-phalcon": "~4.0.0-rc.3" + "ext-phalcon": "~4.0.0-rc.3", + "phalcon/migrations": "dev-master" }, "require-dev": { "codeception/codeception": "^3.1", @@ -28,12 +29,14 @@ }, "autoload": { "psr-4": { - "Invo\\": "app/" + "Invo\\": "src/" } }, "archive": { "exclude": [ - "CONTRIBUTING.md" + "CONTRIBUTING.md", + "phpcs.xml.dist", + "psalm.xml" ] } } diff --git a/public/index.php b/public/index.php index bead3faf..8a6687da 100644 --- a/public/index.php +++ b/public/index.php @@ -10,7 +10,7 @@ $di = new FactoryDefault(); $di->offsetSet('rootPath', $rootPath); - $providers = $rootPath . '/app/config/providers.php'; + $providers = $rootPath . '/src/config/providers.php'; if (!file_exists($providers) || !is_readable($providers)) { throw new Exception('File providers.php does not exist or is not readable.'); } diff --git a/schemas/createdb.php b/schemas/createdb.php index d07d6aec..ce7bc284 100644 --- a/schemas/createdb.php +++ b/schemas/createdb.php @@ -13,7 +13,7 @@ use Phalcon\Config; try { - $configFile = __DIR__ . '/../app/config/config.ini'; + $configFile = __DIR__ . '/../src/config/config.ini'; if (!is_file($configFile)) { throw new Exception( sprintf('Unable to read config file located at %s.', $configFile) diff --git a/app/config/config.ini b/src/config/config.ini similarity index 100% rename from app/config/config.ini rename to src/config/config.ini diff --git a/app/config/providers.php b/src/config/providers.php similarity index 100% rename from app/config/providers.php rename to src/config/providers.php diff --git a/app/controllers/AboutController.php b/src/controllers/AboutController.php similarity index 100% rename from app/controllers/AboutController.php rename to src/controllers/AboutController.php diff --git a/app/controllers/CompaniesController.php b/src/controllers/CompaniesController.php similarity index 100% rename from app/controllers/CompaniesController.php rename to src/controllers/CompaniesController.php diff --git a/app/controllers/ContactController.php b/src/controllers/ContactController.php similarity index 100% rename from app/controllers/ContactController.php rename to src/controllers/ContactController.php diff --git a/app/controllers/ControllerBase.php b/src/controllers/ControllerBase.php similarity index 100% rename from app/controllers/ControllerBase.php rename to src/controllers/ControllerBase.php diff --git a/app/controllers/ErrorsController.php b/src/controllers/ErrorsController.php similarity index 100% rename from app/controllers/ErrorsController.php rename to src/controllers/ErrorsController.php diff --git a/app/controllers/IndexController.php b/src/controllers/IndexController.php similarity index 100% rename from app/controllers/IndexController.php rename to src/controllers/IndexController.php diff --git a/app/controllers/InvoicesController.php b/src/controllers/InvoicesController.php similarity index 100% rename from app/controllers/InvoicesController.php rename to src/controllers/InvoicesController.php diff --git a/app/controllers/ProductsController.php b/src/controllers/ProductsController.php similarity index 100% rename from app/controllers/ProductsController.php rename to src/controllers/ProductsController.php diff --git a/app/controllers/ProducttypesController.php b/src/controllers/ProducttypesController.php similarity index 100% rename from app/controllers/ProducttypesController.php rename to src/controllers/ProducttypesController.php diff --git a/app/controllers/RegisterController.php b/src/controllers/RegisterController.php similarity index 100% rename from app/controllers/RegisterController.php rename to src/controllers/RegisterController.php diff --git a/app/controllers/SessionController.php b/src/controllers/SessionController.php similarity index 100% rename from app/controllers/SessionController.php rename to src/controllers/SessionController.php diff --git a/app/forms/CompaniesForm.php b/src/forms/CompaniesForm.php similarity index 100% rename from app/forms/CompaniesForm.php rename to src/forms/CompaniesForm.php diff --git a/app/forms/ContactForm.php b/src/forms/ContactForm.php similarity index 100% rename from app/forms/ContactForm.php rename to src/forms/ContactForm.php diff --git a/app/forms/ProductTypesForm.php b/src/forms/ProductTypesForm.php similarity index 100% rename from app/forms/ProductTypesForm.php rename to src/forms/ProductTypesForm.php diff --git a/app/forms/ProductsForm.php b/src/forms/ProductsForm.php similarity index 100% rename from app/forms/ProductsForm.php rename to src/forms/ProductsForm.php diff --git a/app/forms/RegisterForm.php b/src/forms/RegisterForm.php similarity index 100% rename from app/forms/RegisterForm.php rename to src/forms/RegisterForm.php diff --git a/app/logs/.gitignore b/src/logs/.gitignore similarity index 100% rename from app/logs/.gitignore rename to src/logs/.gitignore diff --git a/app/models/Companies.php b/src/models/Companies.php similarity index 100% rename from app/models/Companies.php rename to src/models/Companies.php diff --git a/app/models/Contact.php b/src/models/Contact.php similarity index 100% rename from app/models/Contact.php rename to src/models/Contact.php diff --git a/app/models/ProductTypes.php b/src/models/ProductTypes.php similarity index 100% rename from app/models/ProductTypes.php rename to src/models/ProductTypes.php diff --git a/app/models/Products.php b/src/models/Products.php similarity index 100% rename from app/models/Products.php rename to src/models/Products.php diff --git a/app/models/Users.php b/src/models/Users.php similarity index 100% rename from app/models/Users.php rename to src/models/Users.php diff --git a/app/plugins/ElementsPlugin.php b/src/plugins/ElementsPlugin.php similarity index 100% rename from app/plugins/ElementsPlugin.php rename to src/plugins/ElementsPlugin.php diff --git a/app/plugins/NotFoundPlugin.php b/src/plugins/NotFoundPlugin.php similarity index 100% rename from app/plugins/NotFoundPlugin.php rename to src/plugins/NotFoundPlugin.php diff --git a/app/plugins/SecurityPlugin.php b/src/plugins/SecurityPlugin.php similarity index 100% rename from app/plugins/SecurityPlugin.php rename to src/plugins/SecurityPlugin.php diff --git a/app/providers/ConfigProvider.php b/src/providers/ConfigProvider.php similarity index 72% rename from app/providers/ConfigProvider.php rename to src/providers/ConfigProvider.php index 441825a4..a3c1dffa 100644 --- a/app/providers/ConfigProvider.php +++ b/src/providers/ConfigProvider.php @@ -16,10 +16,10 @@ public function register(DiInterface $di) { $rootPath = $di->offsetGet('rootPath'); $di->setShared('config', function () use ($rootPath) { - $config = new ConfigIni($rootPath . '/app/config/config.ini'); + $config = new ConfigIni($rootPath . '/src/config/config.ini'); - if (is_readable($rootPath . '/app/config/config.ini.dev')) { - $override = new ConfigIni($rootPath . 'app/config/config.ini.dev'); + if (is_readable($rootPath . '/src/config/config.ini.dev')) { + $override = new ConfigIni($rootPath . '/src/config/config.ini.dev'); $config->merge($override); } diff --git a/app/providers/DatabaseProvider.php b/src/providers/DatabaseProvider.php similarity index 100% rename from app/providers/DatabaseProvider.php rename to src/providers/DatabaseProvider.php diff --git a/app/providers/DispatcherProvider.php b/src/providers/DispatcherProvider.php similarity index 100% rename from app/providers/DispatcherProvider.php rename to src/providers/DispatcherProvider.php diff --git a/app/providers/ElementsProvider.php b/src/providers/ElementsProvider.php similarity index 100% rename from app/providers/ElementsProvider.php rename to src/providers/ElementsProvider.php diff --git a/app/providers/FlashProvider.php b/src/providers/FlashProvider.php similarity index 100% rename from app/providers/FlashProvider.php rename to src/providers/FlashProvider.php diff --git a/app/providers/SessionProvider.php b/src/providers/SessionProvider.php similarity index 100% rename from app/providers/SessionProvider.php rename to src/providers/SessionProvider.php diff --git a/app/providers/UrlProvider.php b/src/providers/UrlProvider.php similarity index 100% rename from app/providers/UrlProvider.php rename to src/providers/UrlProvider.php diff --git a/app/providers/ViewProvider.php b/src/providers/ViewProvider.php similarity index 100% rename from app/providers/ViewProvider.php rename to src/providers/ViewProvider.php diff --git a/app/providers/VoltProvider.php b/src/providers/VoltProvider.php similarity index 100% rename from app/providers/VoltProvider.php rename to src/providers/VoltProvider.php diff --git a/app/views/about/index.volt b/src/views/about/index.volt similarity index 100% rename from app/views/about/index.volt rename to src/views/about/index.volt diff --git a/app/views/companies/edit.volt b/src/views/companies/edit.volt similarity index 100% rename from app/views/companies/edit.volt rename to src/views/companies/edit.volt diff --git a/app/views/companies/index.volt b/src/views/companies/index.volt similarity index 100% rename from app/views/companies/index.volt rename to src/views/companies/index.volt diff --git a/app/views/companies/new.volt b/src/views/companies/new.volt similarity index 100% rename from app/views/companies/new.volt rename to src/views/companies/new.volt diff --git a/app/views/companies/search.volt b/src/views/companies/search.volt similarity index 100% rename from app/views/companies/search.volt rename to src/views/companies/search.volt diff --git a/app/views/contact/index.volt b/src/views/contact/index.volt similarity index 100% rename from app/views/contact/index.volt rename to src/views/contact/index.volt diff --git a/app/views/errors/show401.volt b/src/views/errors/show401.volt similarity index 100% rename from app/views/errors/show401.volt rename to src/views/errors/show401.volt diff --git a/app/views/errors/show404.volt b/src/views/errors/show404.volt similarity index 100% rename from app/views/errors/show404.volt rename to src/views/errors/show404.volt diff --git a/app/views/errors/show500.volt b/src/views/errors/show500.volt similarity index 100% rename from app/views/errors/show500.volt rename to src/views/errors/show500.volt diff --git a/app/views/index.volt b/src/views/index.volt similarity index 100% rename from app/views/index.volt rename to src/views/index.volt diff --git a/app/views/index/index.volt b/src/views/index/index.volt similarity index 100% rename from app/views/index/index.volt rename to src/views/index/index.volt diff --git a/app/views/invoices/index.volt b/src/views/invoices/index.volt similarity index 100% rename from app/views/invoices/index.volt rename to src/views/invoices/index.volt diff --git a/app/views/invoices/profile.volt b/src/views/invoices/profile.volt similarity index 100% rename from app/views/invoices/profile.volt rename to src/views/invoices/profile.volt diff --git a/app/views/layouts/about.volt b/src/views/layouts/about.volt similarity index 100% rename from app/views/layouts/about.volt rename to src/views/layouts/about.volt diff --git a/app/views/layouts/companies.volt b/src/views/layouts/companies.volt similarity index 100% rename from app/views/layouts/companies.volt rename to src/views/layouts/companies.volt diff --git a/app/views/layouts/contact.volt b/src/views/layouts/contact.volt similarity index 100% rename from app/views/layouts/contact.volt rename to src/views/layouts/contact.volt diff --git a/app/views/layouts/errors.volt b/src/views/layouts/errors.volt similarity index 100% rename from app/views/layouts/errors.volt rename to src/views/layouts/errors.volt diff --git a/app/views/layouts/index.volt b/src/views/layouts/index.volt similarity index 100% rename from app/views/layouts/index.volt rename to src/views/layouts/index.volt diff --git a/app/views/layouts/invoices.volt b/src/views/layouts/invoices.volt similarity index 100% rename from app/views/layouts/invoices.volt rename to src/views/layouts/invoices.volt diff --git a/app/views/layouts/main.volt b/src/views/layouts/main.volt similarity index 100% rename from app/views/layouts/main.volt rename to src/views/layouts/main.volt diff --git a/app/views/layouts/products.volt b/src/views/layouts/products.volt similarity index 100% rename from app/views/layouts/products.volt rename to src/views/layouts/products.volt diff --git a/app/views/layouts/producttypes.volt b/src/views/layouts/producttypes.volt similarity index 100% rename from app/views/layouts/producttypes.volt rename to src/views/layouts/producttypes.volt diff --git a/app/views/layouts/register.volt b/src/views/layouts/register.volt similarity index 100% rename from app/views/layouts/register.volt rename to src/views/layouts/register.volt diff --git a/app/views/layouts/session.volt b/src/views/layouts/session.volt similarity index 100% rename from app/views/layouts/session.volt rename to src/views/layouts/session.volt diff --git a/app/views/products/edit.volt b/src/views/products/edit.volt similarity index 100% rename from app/views/products/edit.volt rename to src/views/products/edit.volt diff --git a/app/views/products/index.volt b/src/views/products/index.volt similarity index 100% rename from app/views/products/index.volt rename to src/views/products/index.volt diff --git a/app/views/products/new.volt b/src/views/products/new.volt similarity index 100% rename from app/views/products/new.volt rename to src/views/products/new.volt diff --git a/app/views/products/search.volt b/src/views/products/search.volt similarity index 100% rename from app/views/products/search.volt rename to src/views/products/search.volt diff --git a/app/views/producttypes/edit.volt b/src/views/producttypes/edit.volt similarity index 100% rename from app/views/producttypes/edit.volt rename to src/views/producttypes/edit.volt diff --git a/app/views/producttypes/index.volt b/src/views/producttypes/index.volt similarity index 100% rename from app/views/producttypes/index.volt rename to src/views/producttypes/index.volt diff --git a/app/views/producttypes/new.volt b/src/views/producttypes/new.volt similarity index 100% rename from app/views/producttypes/new.volt rename to src/views/producttypes/new.volt diff --git a/app/views/producttypes/search.volt b/src/views/producttypes/search.volt similarity index 100% rename from app/views/producttypes/search.volt rename to src/views/producttypes/search.volt diff --git a/app/views/register/index.volt b/src/views/register/index.volt similarity index 100% rename from app/views/register/index.volt rename to src/views/register/index.volt diff --git a/app/views/session/index.volt b/src/views/session/index.volt similarity index 100% rename from app/views/session/index.volt rename to src/views/session/index.volt From 8483102a4322b938650bcb4e267b8beb2f669353 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 19:18:58 +0000 Subject: [PATCH 019/118] #76 - Include composer vendor autoload --- public/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/public/index.php b/public/index.php index 8a6687da..b3fdaa1a 100644 --- a/public/index.php +++ b/public/index.php @@ -6,6 +6,7 @@ try { $rootPath = realpath('..'); + require_once $rootPath . '/vendor/autoload.php'; $di = new FactoryDefault(); $di->offsetSet('rootPath', $rootPath); From 851796075566a2cf6bc58c8a40ff4d5a3b32b6fd Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 19:19:42 +0000 Subject: [PATCH 020/118] #76 - Capitalize directory names --- src/{controllers => Controllers}/AboutController.php | 0 src/{controllers => Controllers}/CompaniesController.php | 0 src/{controllers => Controllers}/ContactController.php | 0 src/{controllers => Controllers}/ControllerBase.php | 0 src/{controllers => Controllers}/ErrorsController.php | 0 src/{controllers => Controllers}/IndexController.php | 0 src/{controllers => Controllers}/InvoicesController.php | 0 src/{controllers => Controllers}/ProductsController.php | 0 src/{controllers => Controllers}/ProducttypesController.php | 0 src/{controllers => Controllers}/RegisterController.php | 0 src/{controllers => Controllers}/SessionController.php | 0 src/{forms => Forms}/CompaniesForm.php | 0 src/{forms => Forms}/ContactForm.php | 0 src/{forms => Forms}/ProductTypesForm.php | 0 src/{forms => Forms}/ProductsForm.php | 0 src/{forms => Forms}/RegisterForm.php | 0 src/{models => Models}/Companies.php | 0 src/{models => Models}/Contact.php | 0 src/{models => Models}/ProductTypes.php | 0 src/{models => Models}/Products.php | 0 src/{models => Models}/Users.php | 0 src/{plugins => Plugins}/ElementsPlugin.php | 0 src/{plugins => Plugins}/NotFoundPlugin.php | 0 src/{plugins => Plugins}/SecurityPlugin.php | 0 src/{providers => Providers}/ConfigProvider.php | 0 src/{providers => Providers}/DatabaseProvider.php | 0 src/{providers => Providers}/DispatcherProvider.php | 0 src/{providers => Providers}/ElementsProvider.php | 0 src/{providers => Providers}/FlashProvider.php | 0 src/{providers => Providers}/SessionProvider.php | 0 src/{providers => Providers}/UrlProvider.php | 0 src/{providers => Providers}/ViewProvider.php | 0 src/{providers => Providers}/VoltProvider.php | 0 33 files changed, 0 insertions(+), 0 deletions(-) rename src/{controllers => Controllers}/AboutController.php (100%) rename src/{controllers => Controllers}/CompaniesController.php (100%) rename src/{controllers => Controllers}/ContactController.php (100%) rename src/{controllers => Controllers}/ControllerBase.php (100%) rename src/{controllers => Controllers}/ErrorsController.php (100%) rename src/{controllers => Controllers}/IndexController.php (100%) rename src/{controllers => Controllers}/InvoicesController.php (100%) rename src/{controllers => Controllers}/ProductsController.php (100%) rename src/{controllers => Controllers}/ProducttypesController.php (100%) rename src/{controllers => Controllers}/RegisterController.php (100%) rename src/{controllers => Controllers}/SessionController.php (100%) rename src/{forms => Forms}/CompaniesForm.php (100%) rename src/{forms => Forms}/ContactForm.php (100%) rename src/{forms => Forms}/ProductTypesForm.php (100%) rename src/{forms => Forms}/ProductsForm.php (100%) rename src/{forms => Forms}/RegisterForm.php (100%) rename src/{models => Models}/Companies.php (100%) rename src/{models => Models}/Contact.php (100%) rename src/{models => Models}/ProductTypes.php (100%) rename src/{models => Models}/Products.php (100%) rename src/{models => Models}/Users.php (100%) rename src/{plugins => Plugins}/ElementsPlugin.php (100%) rename src/{plugins => Plugins}/NotFoundPlugin.php (100%) rename src/{plugins => Plugins}/SecurityPlugin.php (100%) rename src/{providers => Providers}/ConfigProvider.php (100%) rename src/{providers => Providers}/DatabaseProvider.php (100%) rename src/{providers => Providers}/DispatcherProvider.php (100%) rename src/{providers => Providers}/ElementsProvider.php (100%) rename src/{providers => Providers}/FlashProvider.php (100%) rename src/{providers => Providers}/SessionProvider.php (100%) rename src/{providers => Providers}/UrlProvider.php (100%) rename src/{providers => Providers}/ViewProvider.php (100%) rename src/{providers => Providers}/VoltProvider.php (100%) diff --git a/src/controllers/AboutController.php b/src/Controllers/AboutController.php similarity index 100% rename from src/controllers/AboutController.php rename to src/Controllers/AboutController.php diff --git a/src/controllers/CompaniesController.php b/src/Controllers/CompaniesController.php similarity index 100% rename from src/controllers/CompaniesController.php rename to src/Controllers/CompaniesController.php diff --git a/src/controllers/ContactController.php b/src/Controllers/ContactController.php similarity index 100% rename from src/controllers/ContactController.php rename to src/Controllers/ContactController.php diff --git a/src/controllers/ControllerBase.php b/src/Controllers/ControllerBase.php similarity index 100% rename from src/controllers/ControllerBase.php rename to src/Controllers/ControllerBase.php diff --git a/src/controllers/ErrorsController.php b/src/Controllers/ErrorsController.php similarity index 100% rename from src/controllers/ErrorsController.php rename to src/Controllers/ErrorsController.php diff --git a/src/controllers/IndexController.php b/src/Controllers/IndexController.php similarity index 100% rename from src/controllers/IndexController.php rename to src/Controllers/IndexController.php diff --git a/src/controllers/InvoicesController.php b/src/Controllers/InvoicesController.php similarity index 100% rename from src/controllers/InvoicesController.php rename to src/Controllers/InvoicesController.php diff --git a/src/controllers/ProductsController.php b/src/Controllers/ProductsController.php similarity index 100% rename from src/controllers/ProductsController.php rename to src/Controllers/ProductsController.php diff --git a/src/controllers/ProducttypesController.php b/src/Controllers/ProducttypesController.php similarity index 100% rename from src/controllers/ProducttypesController.php rename to src/Controllers/ProducttypesController.php diff --git a/src/controllers/RegisterController.php b/src/Controllers/RegisterController.php similarity index 100% rename from src/controllers/RegisterController.php rename to src/Controllers/RegisterController.php diff --git a/src/controllers/SessionController.php b/src/Controllers/SessionController.php similarity index 100% rename from src/controllers/SessionController.php rename to src/Controllers/SessionController.php diff --git a/src/forms/CompaniesForm.php b/src/Forms/CompaniesForm.php similarity index 100% rename from src/forms/CompaniesForm.php rename to src/Forms/CompaniesForm.php diff --git a/src/forms/ContactForm.php b/src/Forms/ContactForm.php similarity index 100% rename from src/forms/ContactForm.php rename to src/Forms/ContactForm.php diff --git a/src/forms/ProductTypesForm.php b/src/Forms/ProductTypesForm.php similarity index 100% rename from src/forms/ProductTypesForm.php rename to src/Forms/ProductTypesForm.php diff --git a/src/forms/ProductsForm.php b/src/Forms/ProductsForm.php similarity index 100% rename from src/forms/ProductsForm.php rename to src/Forms/ProductsForm.php diff --git a/src/forms/RegisterForm.php b/src/Forms/RegisterForm.php similarity index 100% rename from src/forms/RegisterForm.php rename to src/Forms/RegisterForm.php diff --git a/src/models/Companies.php b/src/Models/Companies.php similarity index 100% rename from src/models/Companies.php rename to src/Models/Companies.php diff --git a/src/models/Contact.php b/src/Models/Contact.php similarity index 100% rename from src/models/Contact.php rename to src/Models/Contact.php diff --git a/src/models/ProductTypes.php b/src/Models/ProductTypes.php similarity index 100% rename from src/models/ProductTypes.php rename to src/Models/ProductTypes.php diff --git a/src/models/Products.php b/src/Models/Products.php similarity index 100% rename from src/models/Products.php rename to src/Models/Products.php diff --git a/src/models/Users.php b/src/Models/Users.php similarity index 100% rename from src/models/Users.php rename to src/Models/Users.php diff --git a/src/plugins/ElementsPlugin.php b/src/Plugins/ElementsPlugin.php similarity index 100% rename from src/plugins/ElementsPlugin.php rename to src/Plugins/ElementsPlugin.php diff --git a/src/plugins/NotFoundPlugin.php b/src/Plugins/NotFoundPlugin.php similarity index 100% rename from src/plugins/NotFoundPlugin.php rename to src/Plugins/NotFoundPlugin.php diff --git a/src/plugins/SecurityPlugin.php b/src/Plugins/SecurityPlugin.php similarity index 100% rename from src/plugins/SecurityPlugin.php rename to src/Plugins/SecurityPlugin.php diff --git a/src/providers/ConfigProvider.php b/src/Providers/ConfigProvider.php similarity index 100% rename from src/providers/ConfigProvider.php rename to src/Providers/ConfigProvider.php diff --git a/src/providers/DatabaseProvider.php b/src/Providers/DatabaseProvider.php similarity index 100% rename from src/providers/DatabaseProvider.php rename to src/Providers/DatabaseProvider.php diff --git a/src/providers/DispatcherProvider.php b/src/Providers/DispatcherProvider.php similarity index 100% rename from src/providers/DispatcherProvider.php rename to src/Providers/DispatcherProvider.php diff --git a/src/providers/ElementsProvider.php b/src/Providers/ElementsProvider.php similarity index 100% rename from src/providers/ElementsProvider.php rename to src/Providers/ElementsProvider.php diff --git a/src/providers/FlashProvider.php b/src/Providers/FlashProvider.php similarity index 100% rename from src/providers/FlashProvider.php rename to src/Providers/FlashProvider.php diff --git a/src/providers/SessionProvider.php b/src/Providers/SessionProvider.php similarity index 100% rename from src/providers/SessionProvider.php rename to src/Providers/SessionProvider.php diff --git a/src/providers/UrlProvider.php b/src/Providers/UrlProvider.php similarity index 100% rename from src/providers/UrlProvider.php rename to src/Providers/UrlProvider.php diff --git a/src/providers/ViewProvider.php b/src/Providers/ViewProvider.php similarity index 100% rename from src/providers/ViewProvider.php rename to src/Providers/ViewProvider.php diff --git a/src/providers/VoltProvider.php b/src/Providers/VoltProvider.php similarity index 100% rename from src/providers/VoltProvider.php rename to src/Providers/VoltProvider.php From 37f38dc3d0c07d6a6dcd263a8bf1db560cdd8900 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 19:22:58 +0000 Subject: [PATCH 021/118] #76 - Fix implementation of register() method --- src/Providers/ConfigProvider.php | 2 +- src/Providers/DatabaseProvider.php | 2 +- src/Providers/DispatcherProvider.php | 2 +- src/Providers/ElementsProvider.php | 2 +- src/Providers/FlashProvider.php | 2 +- src/Providers/SessionProvider.php | 2 +- src/Providers/UrlProvider.php | 2 +- src/Providers/ViewProvider.php | 2 +- src/Providers/VoltProvider.php | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Providers/ConfigProvider.php b/src/Providers/ConfigProvider.php index a3c1dffa..017da486 100644 --- a/src/Providers/ConfigProvider.php +++ b/src/Providers/ConfigProvider.php @@ -12,7 +12,7 @@ */ final class ConfigProvider implements ServiceProviderInterface { - public function register(DiInterface $di) + public function register(DiInterface $di): void { $rootPath = $di->offsetGet('rootPath'); $di->setShared('config', function () use ($rootPath) { diff --git a/src/Providers/DatabaseProvider.php b/src/Providers/DatabaseProvider.php index 400a4702..1b031350 100644 --- a/src/Providers/DatabaseProvider.php +++ b/src/Providers/DatabaseProvider.php @@ -11,7 +11,7 @@ */ final class DatabaseProvider implements ServiceProviderInterface { - public function register(DiInterface $di) + public function register(DiInterface $di): void { $dbConfig = $di->getShared('config')->get('database')->toArray(); $di->setShared('db', function () use ($dbConfig) { diff --git a/src/Providers/DispatcherProvider.php b/src/Providers/DispatcherProvider.php index 6290a1d9..c3047841 100644 --- a/src/Providers/DispatcherProvider.php +++ b/src/Providers/DispatcherProvider.php @@ -15,7 +15,7 @@ */ final class DispatcherProvider implements ServiceProviderInterface { - public function register(DiInterface $di) + public function register(DiInterface $di): void { $di->setShared('dispatcher', function () { $eventsManager = new EventsManager; diff --git a/src/Providers/ElementsProvider.php b/src/Providers/ElementsProvider.php index 1345428e..cb7b60ef 100644 --- a/src/Providers/ElementsProvider.php +++ b/src/Providers/ElementsProvider.php @@ -12,7 +12,7 @@ */ final class ElementsProvider implements ServiceProviderInterface { - public function register(DiInterface $di) + public function register(DiInterface $di): void { $di->setShared('elements', function () { return new ElementsPlugin(); diff --git a/src/Providers/FlashProvider.php b/src/Providers/FlashProvider.php index 76c508f6..54483653 100644 --- a/src/Providers/FlashProvider.php +++ b/src/Providers/FlashProvider.php @@ -12,7 +12,7 @@ */ final class FlashProvider implements ServiceProviderInterface { - public function register(DiInterface $di) + public function register(DiInterface $di): void { $di->setShared('flash', function () { $flash = new FlashSession(); diff --git a/src/Providers/SessionProvider.php b/src/Providers/SessionProvider.php index 417fbb9d..1abd3413 100644 --- a/src/Providers/SessionProvider.php +++ b/src/Providers/SessionProvider.php @@ -13,7 +13,7 @@ */ final class SessionProvider implements ServiceProviderInterface { - public function register(DiInterface $di) + public function register(DiInterface $di): void { $di->setShared('session', function () { $session = new SessionManager(); diff --git a/src/Providers/UrlProvider.php b/src/Providers/UrlProvider.php index aaf1b359..40facec5 100644 --- a/src/Providers/UrlProvider.php +++ b/src/Providers/UrlProvider.php @@ -12,7 +12,7 @@ */ final class UrlProvider implements ServiceProviderInterface { - public function register(DiInterface $di) + public function register(DiInterface $di): void { $baseUri = $di->getShared('config')->application->baseUri; $di->setShared('db', function () use ($baseUri) { diff --git a/src/Providers/ViewProvider.php b/src/Providers/ViewProvider.php index 4a8ef3aa..0924dbab 100644 --- a/src/Providers/ViewProvider.php +++ b/src/Providers/ViewProvider.php @@ -9,7 +9,7 @@ final class ViewProvider implements ServiceProviderInterface { - public function register(DiInterface $di) + public function register(DiInterface $di): void { $viewsDir = $di->offsetGet('rootPath') . $di->getShared('config')->application->viewsDir; diff --git a/src/Providers/VoltProvider.php b/src/Providers/VoltProvider.php index 90ce6157..7e8b0fd9 100644 --- a/src/Providers/VoltProvider.php +++ b/src/Providers/VoltProvider.php @@ -9,7 +9,7 @@ final class VoltProvider implements ServiceProviderInterface { - public function register(DiInterface $di) + public function register(DiInterface $di): void { $view = $di->getShared('view'); From 7e87bb95f699dd8bcd3f0d925d406a9672ee86d9 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:01:43 +0000 Subject: [PATCH 022/118] #76 - Add HTTP status codes inside ErrorsController --- src/Controllers/ErrorsController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Controllers/ErrorsController.php b/src/Controllers/ErrorsController.php index 25bb2085..44628891 100644 --- a/src/Controllers/ErrorsController.php +++ b/src/Controllers/ErrorsController.php @@ -17,15 +17,18 @@ public function initialize() parent::initialize(); } - public function show404Action() + public function show404Action(): void { + $this->response->setStatusCode(404); } - public function show401Action() + public function show401Action(): void { + $this->response->setStatusCode(401); } - public function show500Action() + public function show500Action(): void { + $this->response->setStatusCode(500); } } From 4c9b21e575a5ab4ffeddc400f1756673894ea88d Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:02:41 +0000 Subject: [PATCH 023/118] #76 - Adapt service registration to the classic format --- public/index.php | 12 +++++++++-- src/config/providers.php | 46 +++++++++------------------------------- 2 files changed, 20 insertions(+), 38 deletions(-) diff --git a/public/index.php b/public/index.php index b3fdaa1a..6ada7299 100644 --- a/public/index.php +++ b/public/index.php @@ -2,6 +2,7 @@ declare(strict_types=1); use Phalcon\Di\FactoryDefault; +use Phalcon\Di\ServiceProviderInterface; use Phalcon\Mvc\Application; try { @@ -9,14 +10,21 @@ require_once $rootPath . '/vendor/autoload.php'; $di = new FactoryDefault(); - $di->offsetSet('rootPath', $rootPath); + $di->offsetSet('rootPath', function() use ($rootPath) { + return $rootPath; + }); $providers = $rootPath . '/src/config/providers.php'; if (!file_exists($providers) || !is_readable($providers)) { throw new Exception('File providers.php does not exist or is not readable.'); } - $di->loadFromPhp($providers); + /** @var array $providers */ + $providers = include_once $providers; + /** @var ServiceProviderInterface $provider */ + foreach ($providers as $provider) { + $di->register(new $provider()); + } (new Application($di)) ->handle($_SERVER['REQUEST_URI']) diff --git a/src/config/providers.php b/src/config/providers.php index c52c3f96..b201b476 100644 --- a/src/config/providers.php +++ b/src/config/providers.php @@ -1,40 +1,14 @@ [ - 'className' => \Invo\Providers\ConfigProvider::class, - 'shared' => true, - ], - 'db' => [ - 'className' => \Invo\Providers\DatabaseProvider::class, - 'shared' => true, - ], - 'dispatcher' => [ - 'className' => \Invo\Providers\DispatcherProvider::class, - 'shared' => true, - ], - 'elements' => [ - 'className' => \Invo\Providers\ElementsProvider::class, - 'shared' => true, - ], - 'flash' => [ - 'className' => \Invo\Providers\FlashProvider::class, - 'shared' => true, - ], - 'session' => [ - 'className' => \Invo\Providers\SessionProvider::class, - 'shared' => true, - ], - 'url' => [ - 'className' => \Invo\Providers\UrlProvider::class, - 'shared' => true, - ], - 'view' => [ - 'className' => \Invo\Providers\ViewProvider::class, - 'shared' => true, - ], - 'volt' => [ - 'className' => \Invo\Providers\VoltProvider::class, - 'shared' => true, - ], + \Invo\Providers\ConfigProvider::class, + \Invo\Providers\DatabaseProvider::class, + \Invo\Providers\DispatcherProvider::class, + \Invo\Providers\ElementsProvider::class, + \Invo\Providers\FlashProvider::class, + \Invo\Providers\SessionProvider::class, + \Invo\Providers\SessionBagProvider::class, + \Invo\Providers\UrlProvider::class, + \Invo\Providers\ViewProvider::class, + \Invo\Providers\VoltProvider::class, ]; From 949638a2c16ab2847dd2ac03538f80cfec685995 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:02:57 +0000 Subject: [PATCH 024/118] #76 - Implement SessionBag provider --- src/Providers/SessionBagProvider.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/Providers/SessionBagProvider.php diff --git a/src/Providers/SessionBagProvider.php b/src/Providers/SessionBagProvider.php new file mode 100644 index 00000000..218c58c9 --- /dev/null +++ b/src/Providers/SessionBagProvider.php @@ -0,0 +1,18 @@ +setShared('sessionBag', function () { + return new Bag('bag'); + }); + } +} From 426efe064d7da637b3fda014e6168cd3cfad4d46 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:03:44 +0000 Subject: [PATCH 025/118] #76 - Add setDefaultNamespace() method in Dispatcher provider --- src/Providers/DispatcherProvider.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Providers/DispatcherProvider.php b/src/Providers/DispatcherProvider.php index c3047841..7a9d08c1 100644 --- a/src/Providers/DispatcherProvider.php +++ b/src/Providers/DispatcherProvider.php @@ -18,7 +18,7 @@ final class DispatcherProvider implements ServiceProviderInterface public function register(DiInterface $di): void { $di->setShared('dispatcher', function () { - $eventsManager = new EventsManager; + $eventsManager = new EventsManager(); /** * Check if the user is allowed to access certain action using the SecurityPlugin @@ -30,7 +30,8 @@ public function register(DiInterface $di): void */ $eventsManager->attach('dispatch:beforeException', new NotFoundPlugin); - $dispatcher = new Dispatcher; + $dispatcher = new Dispatcher(); + $dispatcher->setDefaultNamespace('Invo\Controllers'); $dispatcher->setEventsManager($eventsManager); return $dispatcher; From 005a78febf25b0da411d1c261611e971247dc132 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:06:28 +0000 Subject: [PATCH 026/118] #76 - Refactor SecurityPlugin class --- src/Plugins/SecurityPlugin.php | 152 +++++++++++++++++---------------- 1 file changed, 77 insertions(+), 75 deletions(-) diff --git a/src/Plugins/SecurityPlugin.php b/src/Plugins/SecurityPlugin.php index f111768d..459a3c31 100644 --- a/src/Plugins/SecurityPlugin.php +++ b/src/Plugins/SecurityPlugin.php @@ -18,80 +18,6 @@ */ class SecurityPlugin extends Injectable { - /** - * Returns an existing or new access control list - * - * @returns AclList - */ - public function getAcl() - { - if (!isset($this->persistent->acl)) { - $acl = new AclList(); - $acl->setDefaultAction(Enum::DENY); - - // Register roles - $roles = [ - 'users' => new Role( - 'Users', - 'Member privileges, granted after sign in.' - ), - 'guests' => new Role( - 'Guests', - 'Anyone browsing the site who is not signed in is considered to be a "Guest".' - ) - ]; - - foreach ($roles as $role) { - $acl->addRole($role); - } - - //Private area resources - $privateResources = [ - 'companies' => ['index', 'search', 'new', 'edit', 'save', 'create', 'delete'], - 'products' => ['index', 'search', 'new', 'edit', 'save', 'create', 'delete'], - 'producttypes' => ['index', 'search', 'new', 'edit', 'save', 'create', 'delete'], - 'invoices' => ['index', 'profile'], - ]; - foreach ($privateResources as $resource => $actions) { - $acl->addComponent(new Component($resource), $actions); - } - - //Public area resources - $publicResources = [ - 'index' => ['index'], - 'about' => ['index'], - 'register' => ['index'], - 'errors' => ['show401', 'show404', 'show500'], - 'session' => ['index', 'register', 'start', 'end'], - 'contact' => ['index', 'send'], - ]; - foreach ($publicResources as $resource => $actions) { - $acl->addComponent(new Component($resource), $actions); - } - - //Grant access to public areas to both users and guests - foreach ($roles as $role) { - foreach ($publicResources as $resource => $actions) { - foreach ($actions as $action) { - $acl->allow($role->getName(), $resource, $action); - } - } - } - - //Grant access to private area to role Users - foreach ($privateResources as $resource => $actions) { - foreach ($actions as $action) { - $acl->allow('Users', $resource, $action); - } - } - - //The acl is stored in session, APC would be useful here too - $this->persistent->acl = $acl; - } - - return $this->persistent->acl; - } - /** * This action is executed before execute any action in the application * @@ -113,7 +39,7 @@ public function beforeExecuteRoute(Event $event, Dispatcher $dispatcher) $acl = $this->getAcl(); - if (!$acl->isResource($controller)) { + if (!$acl->isComponent($controller)) { $dispatcher->forward([ 'controller' => 'errors', 'action' => 'show404', @@ -136,4 +62,80 @@ public function beforeExecuteRoute(Event $event, Dispatcher $dispatcher) return true; } + + /** + * Returns an existing or new access control list + * + * @returns AclList + */ + protected function getAcl(): AclList + { + if (isset($this->persistent->acl)) { + return $this->persistent->acl; + } + + $acl = new AclList(); + $acl->setDefaultAction(Enum::DENY); + + // Register roles + $roles = [ + 'users' => new Role( + 'Users', + 'Member privileges, granted after sign in.' + ), + 'guests' => new Role( + 'Guests', + 'Anyone browsing the site who is not signed in is considered to be a "Guest".' + ) + ]; + + foreach ($roles as $role) { + $acl->addRole($role); + } + + //Private area resources + $privateResources = [ + 'companies' => ['index', 'search', 'new', 'edit', 'save', 'create', 'delete'], + 'products' => ['index', 'search', 'new', 'edit', 'save', 'create', 'delete'], + 'producttypes' => ['index', 'search', 'new', 'edit', 'save', 'create', 'delete'], + 'invoices' => ['index', 'profile'], + ]; + foreach ($privateResources as $resource => $actions) { + $acl->addComponent(new Component($resource), $actions); + } + + //Public area resources + $publicResources = [ + 'index' => ['index'], + 'about' => ['index'], + 'register' => ['index'], + 'errors' => ['show401', 'show404', 'show500'], + 'session' => ['index', 'register', 'start', 'end'], + 'contact' => ['index', 'send'], + ]; + foreach ($publicResources as $resource => $actions) { + $acl->addComponent(new Component($resource), $actions); + } + + //Grant access to public areas to both users and guests + foreach ($roles as $role) { + foreach ($publicResources as $resource => $actions) { + foreach ($actions as $action) { + $acl->allow($role->getName(), $resource, $action); + } + } + } + + //Grant access to private area to role Users + foreach ($privateResources as $resource => $actions) { + foreach ($actions as $action) { + $acl->allow('Users', $resource, $action); + } + } + + //The acl is stored in session, APC would be useful here too + $this->persistent->acl = $acl; + + return $acl; + } } From 90de581ddecd1847b1e7c275e756fdc802262992 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:07:01 +0000 Subject: [PATCH 027/118] #76 - Prevent dispatcher looping in NotFoundPlugin --- src/Plugins/NotFoundPlugin.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Plugins/NotFoundPlugin.php b/src/Plugins/NotFoundPlugin.php index 27097e23..a8ac66bf 100644 --- a/src/Plugins/NotFoundPlugin.php +++ b/src/Plugins/NotFoundPlugin.php @@ -22,7 +22,7 @@ class NotFoundPlugin extends Injectable * @param Event $event * @param MvcDispatcher $dispatcher * @param Exception $exception - * @return boolean + * @return bool */ public function beforeException(Event $event, MvcDispatcher $dispatcher, Exception $exception) { @@ -41,11 +41,13 @@ public function beforeException(Event $event, MvcDispatcher $dispatcher, Excepti } } - $dispatcher->forward([ - 'controller' => 'errors', - 'action' => 'show500', - ]); + if ($dispatcher->getControllerName() !== 'errors') { + $dispatcher->forward([ + 'controller' => 'errors', + 'action' => 'show500', + ]); + } - return false; + return !$event->isStopped(); } } From 3fbf99be4ab39180937adf1586defbcd16fc967c Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:09:22 +0000 Subject: [PATCH 028/118] #76 - Clean config.ini --- src/config/config.ini | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/config/config.ini b/src/config/config.ini index af7cd285..9ea27e57 100644 --- a/src/config/config.ini +++ b/src/config/config.ini @@ -7,10 +7,5 @@ dbname = invo charset = utf8 [application] -controllersDir = app/controllers/ -modelsDir = app/models/ -viewsDir = app/views/ -pluginsDir = app/plugins/ -formsDir = app/forms/ -libraryDir = app/library/ +viewsDir = src/views/ baseUri = / From 9413fe451c9885f63989d1e7c2d09cb6d925f990 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:10:32 +0000 Subject: [PATCH 029/118] #76 - Fix html title output --- src/views/index.volt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/index.volt b/src/views/index.volt index 5b5097a2..c4a872bc 100644 --- a/src/views/index.volt +++ b/src/views/index.volt @@ -3,7 +3,7 @@ Phalcon Invo - {{ get_title() }} + {{ get_title() }} {{ stylesheet_link('css/bootstrap.min.css') }} From d628a7fff81c6651d8e482bb4842021e95c770a1 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:14:05 +0000 Subject: [PATCH 030/118] #76 - Fix Url service name --- src/Providers/UrlProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Providers/UrlProvider.php b/src/Providers/UrlProvider.php index 40facec5..063997fc 100644 --- a/src/Providers/UrlProvider.php +++ b/src/Providers/UrlProvider.php @@ -15,7 +15,7 @@ final class UrlProvider implements ServiceProviderInterface public function register(DiInterface $di): void { $baseUri = $di->getShared('config')->application->baseUri; - $di->setShared('db', function () use ($baseUri) { + $di->setShared('url', function () use ($baseUri) { $url = new Url(); $url->setBaseUri($baseUri); From 81023381ea13eac2f98a60b8b40511a304ece275 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:14:19 +0000 Subject: [PATCH 031/118] #76 - Fix views directory path --- src/Providers/ViewProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Providers/ViewProvider.php b/src/Providers/ViewProvider.php index 0924dbab..0635fd3e 100644 --- a/src/Providers/ViewProvider.php +++ b/src/Providers/ViewProvider.php @@ -11,7 +11,7 @@ final class ViewProvider implements ServiceProviderInterface { public function register(DiInterface $di): void { - $viewsDir = $di->offsetGet('rootPath') . $di->getShared('config')->application->viewsDir; + $viewsDir = $di->get('rootPath') . DIRECTORY_SEPARATOR . $di->getShared('config')->application->viewsDir; $di->setShared('view', function () use ($viewsDir) { $view = new View(); From 46611c7c53e388b048f379a51f8d9ce8af8c1d5d Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:16:17 +0000 Subject: [PATCH 032/118] #76 - Fix variables usage in DatabaseProvider --- src/Providers/DatabaseProvider.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Providers/DatabaseProvider.php b/src/Providers/DatabaseProvider.php index 1b031350..eda8360a 100644 --- a/src/Providers/DatabaseProvider.php +++ b/src/Providers/DatabaseProvider.php @@ -16,9 +16,9 @@ public function register(DiInterface $di): void $dbConfig = $di->getShared('config')->get('database')->toArray(); $di->setShared('db', function () use ($dbConfig) { $dbClass = 'Phalcon\Db\Adapter\Pdo\\' . $dbConfig['adapter']; - unset($dbClass['adapter']); + unset($dbConfig['adapter']); - return new $dbClass($dbClass); + return new $dbClass($dbConfig); }); } } From 6054411ce67b0d9666df995264aa76978c6bb571 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:37:02 +0000 Subject: [PATCH 033/118] #76 - Rename 'compiledPath' to 'path' --- src/Providers/VoltProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Providers/VoltProvider.php b/src/Providers/VoltProvider.php index 7e8b0fd9..21f83864 100644 --- a/src/Providers/VoltProvider.php +++ b/src/Providers/VoltProvider.php @@ -16,7 +16,7 @@ public function register(DiInterface $di): void $di->setShared('volt', function () use ($view, $di) { $volt = new VoltEngine($view, $di); $volt->setOptions([ - 'compiledPath' => $di->offsetGet('rootPath') . '/cache/volt/', + 'path' => $di->offsetGet('rootPath') . '/cache/volt/', ]); $compiler = $volt->getCompiler(); From 430cf37eaf9d351afdc448cc8551b9b40ce4a592 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:37:28 +0000 Subject: [PATCH 034/118] #76 - Fix variable type --- src/Controllers/ContactController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controllers/ContactController.php b/src/Controllers/ContactController.php index 9d481e4a..9f8e6ae0 100644 --- a/src/Controllers/ContactController.php +++ b/src/Controllers/ContactController.php @@ -45,7 +45,7 @@ public function sendAction() // Validate the form if (!$form->isValid($data, $contact)) { foreach ($form->getMessages() as $message) { - $this->flash->error($message); + $this->flash->error((string)$message); } return $this->dispatcher->forward([ From 8a0a804125ac0d940733695e0de78971c1824a52 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:37:55 +0000 Subject: [PATCH 035/118] #76 - Change Flash adapter from Session to Direct --- src/Providers/FlashProvider.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Providers/FlashProvider.php b/src/Providers/FlashProvider.php index 54483653..0f3fb1f5 100644 --- a/src/Providers/FlashProvider.php +++ b/src/Providers/FlashProvider.php @@ -5,7 +5,7 @@ use Phalcon\Di\DiInterface; use Phalcon\Di\ServiceProviderInterface; -use Phalcon\Flash\Session as FlashSession; +use Phalcon\Flash\Direct as FlashDirect; /** * Register the flash service with custom CSS classes @@ -15,7 +15,7 @@ final class FlashProvider implements ServiceProviderInterface public function register(DiInterface $di): void { $di->setShared('flash', function () { - $flash = new FlashSession(); + $flash = new FlashDirect(); $flash->setCssClasses([ 'error' => 'alert alert-danger', 'success' => 'alert alert-success', From f536341c28b0233ed178f06ec84703202100b07b Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:41:48 +0000 Subject: [PATCH 036/118] #76 - Fix paths in configs --- phpcs.xml.dist | 2 +- psalm.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 686502a6..53ca31f3 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -8,6 +8,6 @@ - app + src public/index.php diff --git a/psalm.xml b/psalm.xml index f9f57b8d..209af60b 100644 --- a/psalm.xml +++ b/psalm.xml @@ -7,7 +7,7 @@ xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" > - + From 5203d1d72233dc9b7805483e376196af7cc17689 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:43:43 +0000 Subject: [PATCH 037/118] #76 - Fix code style and psalm errors --- public/index.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/public/index.php b/public/index.php index 6ada7299..41ea6f91 100644 --- a/public/index.php +++ b/public/index.php @@ -2,7 +2,6 @@ declare(strict_types=1); use Phalcon\Di\FactoryDefault; -use Phalcon\Di\ServiceProviderInterface; use Phalcon\Mvc\Application; try { @@ -10,7 +9,7 @@ require_once $rootPath . '/vendor/autoload.php'; $di = new FactoryDefault(); - $di->offsetSet('rootPath', function() use ($rootPath) { + $di->offsetSet('rootPath', function () use ($rootPath) { return $rootPath; }); @@ -21,7 +20,6 @@ /** @var array $providers */ $providers = include_once $providers; - /** @var ServiceProviderInterface $provider */ foreach ($providers as $provider) { $di->register(new $provider()); } From b4892044a3d00666074adf4b9d2d2ff6bce58101 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 21:45:35 +0000 Subject: [PATCH 038/118] #76 - Change version of phalcon/migrations package --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ebfc9c01..ea909689 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "require": { "php": ">=7.2", "ext-phalcon": "~4.0.0-rc.3", - "phalcon/migrations": "dev-master" + "phalcon/migrations": "1.0.4" }, "require-dev": { "codeception/codeception": "^3.1", From 27b5a1acd92ebc0ba61ee27a464df09d4056d07f Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 30 Nov 2019 22:25:32 +0000 Subject: [PATCH 039/118] #76 - Bump version of phalcon/ide-stubs to 4.0.0-rc.3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ea909689..6bc69311 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ }, "require-dev": { "codeception/codeception": "^3.1", - "phalcon/ide-stubs": "4.0.0-rc.2", + "phalcon/ide-stubs": "4.0.0-rc.3", "squizlabs/php_codesniffer": "3.5", "vimeo/psalm": "^3.6" }, From 0067842d17bac9db9e948fe9e822e129b31682c7 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Tue, 10 Dec 2019 19:43:46 +0000 Subject: [PATCH 040/118] #76 - Move config/ folder into project root --- {src/config => config}/config.ini | 0 {src/config => config}/providers.php | 0 public/index.php | 2 +- src/Providers/ConfigProvider.php | 6 +++--- 4 files changed, 4 insertions(+), 4 deletions(-) rename {src/config => config}/config.ini (100%) rename {src/config => config}/providers.php (100%) diff --git a/src/config/config.ini b/config/config.ini similarity index 100% rename from src/config/config.ini rename to config/config.ini diff --git a/src/config/providers.php b/config/providers.php similarity index 100% rename from src/config/providers.php rename to config/providers.php diff --git a/public/index.php b/public/index.php index 41ea6f91..449dc6c0 100644 --- a/public/index.php +++ b/public/index.php @@ -13,7 +13,7 @@ return $rootPath; }); - $providers = $rootPath . '/src/config/providers.php'; + $providers = $rootPath . '/config/providers.php'; if (!file_exists($providers) || !is_readable($providers)) { throw new Exception('File providers.php does not exist or is not readable.'); } diff --git a/src/Providers/ConfigProvider.php b/src/Providers/ConfigProvider.php index 017da486..22845e27 100644 --- a/src/Providers/ConfigProvider.php +++ b/src/Providers/ConfigProvider.php @@ -16,10 +16,10 @@ public function register(DiInterface $di): void { $rootPath = $di->offsetGet('rootPath'); $di->setShared('config', function () use ($rootPath) { - $config = new ConfigIni($rootPath . '/src/config/config.ini'); + $config = new ConfigIni($rootPath . '/config/config.ini'); - if (is_readable($rootPath . '/src/config/config.ini.dev')) { - $override = new ConfigIni($rootPath . '/src/config/config.ini.dev'); + if (is_readable($rootPath . '/config/config.ini.dev')) { + $override = new ConfigIni($rootPath . '/config/config.ini.dev'); $config->merge($override); } From a70828bb43dadb1b7faee06591d5f0682222f469 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Wed, 11 Dec 2019 21:42:45 +0000 Subject: [PATCH 041/118] #76 - Add dotenv composer package --- .env.example | 9 +++++++++ .gitignore | 1 + composer.json | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .env.example diff --git a/.env.example b/.env.example new file mode 100644 index 00000000..4c921e35 --- /dev/null +++ b/.env.example @@ -0,0 +1,9 @@ +DB_ADAPTER=Mysql +DB_HOST=localhost +DB_USERNAME=root +DB_PASSWORD= +DB_DBNAME=invo +DB_CHARSET=utf8 + +VIEWS_DIR=src/views/ +BASE_URI=/ diff --git a/.gitignore b/.gitignore index f69bddad..f28f8fbe 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ Thumbs.db vendor/ composer.lock composer.phar +/.env diff --git a/composer.json b/composer.json index 6bc69311..848fb850 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,8 @@ "require": { "php": ">=7.2", "ext-phalcon": "~4.0.0-rc.3", - "phalcon/migrations": "1.0.4" + "phalcon/migrations": "1.0.4", + "vlucas/phpdotenv": "^4.0" }, "require-dev": { "codeception/codeception": "^3.1", From fc7772f9e5d5fad848b64e3c3c73563e673d7c57 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Wed, 11 Dec 2019 21:43:24 +0000 Subject: [PATCH 042/118] #76 - Rewrite config.ini to config.php --- config/config.ini | 11 ----------- config/config.php | 19 +++++++++++++++++++ src/Providers/ConfigProvider.php | 17 +++++++---------- 3 files changed, 26 insertions(+), 21 deletions(-) delete mode 100644 config/config.ini create mode 100644 config/config.php diff --git a/config/config.ini b/config/config.ini deleted file mode 100644 index 9ea27e57..00000000 --- a/config/config.ini +++ /dev/null @@ -1,11 +0,0 @@ -[database] -adapter = Mysql -host = localhost -username = root -password = -dbname = invo -charset = utf8 - -[application] -viewsDir = src/views/ -baseUri = / diff --git a/config/config.php b/config/config.php new file mode 100644 index 00000000..c23737ae --- /dev/null +++ b/config/config.php @@ -0,0 +1,19 @@ + [ + 'adapter' => getenv('DB_ADAPTER'), + 'host' => getenv('DB_HOST'), + 'username' => getenv('DB_USERNAME'), + 'password' => getenv('DB_PASSWORD'), + 'dbname' => getenv('DB_DBNAME'), + 'charset' => getenv('DB_CHARSET'), + ], + 'application' => [ + 'viewsDir' => getenv('VIEWS_DIR'), + 'baseUri' => getenv('BASE_URI'), + ], +]); diff --git a/src/Providers/ConfigProvider.php b/src/Providers/ConfigProvider.php index 22845e27..f95c3f45 100644 --- a/src/Providers/ConfigProvider.php +++ b/src/Providers/ConfigProvider.php @@ -3,9 +3,9 @@ namespace Invo\Providers; -use Phalcon\Config\Adapter\Ini as ConfigIni; use Phalcon\Di\DiInterface; use Phalcon\Di\ServiceProviderInterface; +use Phalcon\Exception; /** * Read the configuration @@ -14,16 +14,13 @@ final class ConfigProvider implements ServiceProviderInterface { public function register(DiInterface $di): void { - $rootPath = $di->offsetGet('rootPath'); - $di->setShared('config', function () use ($rootPath) { - $config = new ConfigIni($rootPath . '/config/config.ini'); + $configPath = $di->offsetGet('rootPath') . '/config/config.php'; + if (!file_exists($configPath) || !is_readable($configPath)) { + throw new Exception('Config file does not exist: ' . $configPath); + } - if (is_readable($rootPath . '/config/config.ini.dev')) { - $override = new ConfigIni($rootPath . '/config/config.ini.dev'); - $config->merge($override); - } - - return $config; + $di->setShared('config', function () use ($configPath) { + return require_once $configPath; }); } } From 18501f12665200bc062d9f4158f970f9e1f3efe5 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Wed, 11 Dec 2019 21:43:41 +0000 Subject: [PATCH 043/118] #76 - Create migrations.php config file --- migrations.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 migrations.php diff --git a/migrations.php b/migrations.php new file mode 100644 index 00000000..897f8e6f --- /dev/null +++ b/migrations.php @@ -0,0 +1,19 @@ +load(); + +return new Config([ + 'database' => [ + 'adapter' => getenv('DB_ADAPTER'), + 'host' => getenv('DB_HOST'), + 'username' => getenv('DB_USERNAME'), + 'password' => getenv('DB_PASSWORD'), + 'dbname' => getenv('DB_DBNAME'), + 'charset' => getenv('DB_CHARSET'), + ], +]); From 028ef2c84d39e4e635b7421f38e33b19fed5c4d2 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 14 Dec 2019 11:01:27 +0000 Subject: [PATCH 044/118] #76 - Bump phalcon/migrations version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 848fb850..3c573d5e 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "require": { "php": ">=7.2", "ext-phalcon": "~4.0.0-rc.3", - "phalcon/migrations": "1.0.4", + "phalcon/migrations": "^1.1", "vlucas/phpdotenv": "^4.0" }, "require-dev": { From eda49bc9c6b78bde7480cd69e56b2a4e9e458d00 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Fri, 20 Dec 2019 20:46:08 +0000 Subject: [PATCH 045/118] #76 - Add Licence in header of files --- src/Controllers/AboutController.php | 9 +++++++++ src/Controllers/CompaniesController.php | 9 +++++++++ src/Controllers/ContactController.php | 9 +++++++++ src/Controllers/ControllerBase.php | 9 +++++++++ src/Controllers/ErrorsController.php | 9 +++++++++ src/Controllers/IndexController.php | 9 +++++++++ src/Controllers/InvoicesController.php | 9 +++++++++ src/Controllers/ProductsController.php | 9 +++++++++ src/Controllers/ProducttypesController.php | 9 +++++++++ src/Controllers/RegisterController.php | 9 +++++++++ src/Controllers/SessionController.php | 9 +++++++++ src/Forms/CompaniesForm.php | 9 +++++++++ src/Forms/ContactForm.php | 9 +++++++++ src/Forms/ProductTypesForm.php | 9 +++++++++ src/Forms/ProductsForm.php | 9 +++++++++ src/Forms/RegisterForm.php | 9 +++++++++ src/Models/Companies.php | 9 +++++++++ src/Models/Contact.php | 9 +++++++++ src/Models/ProductTypes.php | 9 +++++++++ src/Models/Products.php | 9 +++++++++ src/Models/Users.php | 9 +++++++++ src/Plugins/ElementsPlugin.php | 9 +++++++++ src/Plugins/NotFoundPlugin.php | 9 +++++++++ src/Plugins/SecurityPlugin.php | 9 +++++++++ src/Providers/ConfigProvider.php | 9 +++++++++ src/Providers/DatabaseProvider.php | 9 +++++++++ src/Providers/DispatcherProvider.php | 9 +++++++++ src/Providers/ElementsProvider.php | 9 +++++++++ src/Providers/FlashProvider.php | 9 +++++++++ src/Providers/SessionBagProvider.php | 9 +++++++++ src/Providers/SessionProvider.php | 9 +++++++++ src/Providers/UrlProvider.php | 9 +++++++++ src/Providers/ViewProvider.php | 9 +++++++++ src/Providers/VoltProvider.php | 9 +++++++++ 34 files changed, 306 insertions(+) diff --git a/src/Controllers/AboutController.php b/src/Controllers/AboutController.php index bcb691cc..3b435947 100644 --- a/src/Controllers/AboutController.php +++ b/src/Controllers/AboutController.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Controllers; class AboutController extends ControllerBase diff --git a/src/Controllers/CompaniesController.php b/src/Controllers/CompaniesController.php index cb6da9dc..83f30246 100644 --- a/src/Controllers/CompaniesController.php +++ b/src/Controllers/CompaniesController.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Controllers; use Invo\Forms\CompaniesForm; diff --git a/src/Controllers/ContactController.php b/src/Controllers/ContactController.php index 9f8e6ae0..285ae71f 100644 --- a/src/Controllers/ContactController.php +++ b/src/Controllers/ContactController.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Controllers; use Invo\Forms\ContactForm; diff --git a/src/Controllers/ControllerBase.php b/src/Controllers/ControllerBase.php index 415b7e35..7122d3d6 100644 --- a/src/Controllers/ControllerBase.php +++ b/src/Controllers/ControllerBase.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Controllers; use Phalcon\Mvc\Controller; diff --git a/src/Controllers/ErrorsController.php b/src/Controllers/ErrorsController.php index 44628891..371abe6d 100644 --- a/src/Controllers/ErrorsController.php +++ b/src/Controllers/ErrorsController.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Controllers; /** diff --git a/src/Controllers/IndexController.php b/src/Controllers/IndexController.php index bfc0bfcb..bd0ed163 100644 --- a/src/Controllers/IndexController.php +++ b/src/Controllers/IndexController.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Controllers; class IndexController extends ControllerBase diff --git a/src/Controllers/InvoicesController.php b/src/Controllers/InvoicesController.php index cc4b6392..2cefb419 100644 --- a/src/Controllers/InvoicesController.php +++ b/src/Controllers/InvoicesController.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Controllers; use Invo\Models\Users; diff --git a/src/Controllers/ProductsController.php b/src/Controllers/ProductsController.php index 23a8ade9..5ac7df31 100644 --- a/src/Controllers/ProductsController.php +++ b/src/Controllers/ProductsController.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Controllers; use Invo\Models\Products; diff --git a/src/Controllers/ProducttypesController.php b/src/Controllers/ProducttypesController.php index 9eb8fa79..2bfac092 100644 --- a/src/Controllers/ProducttypesController.php +++ b/src/Controllers/ProducttypesController.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Controllers; use Invo\Forms\ProductTypesForm; diff --git a/src/Controllers/RegisterController.php b/src/Controllers/RegisterController.php index 70a9c65a..4422e0c1 100644 --- a/src/Controllers/RegisterController.php +++ b/src/Controllers/RegisterController.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Controllers; use Invo\Forms\RegisterForm; diff --git a/src/Controllers/SessionController.php b/src/Controllers/SessionController.php index a881abe5..092e8e47 100644 --- a/src/Controllers/SessionController.php +++ b/src/Controllers/SessionController.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Controllers; use Invo\Models\Users; diff --git a/src/Forms/CompaniesForm.php b/src/Forms/CompaniesForm.php index 2bb9fe16..d0818a16 100644 --- a/src/Forms/CompaniesForm.php +++ b/src/Forms/CompaniesForm.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Forms; use Phalcon\Forms\Element\Hidden; diff --git a/src/Forms/ContactForm.php b/src/Forms/ContactForm.php index 5fb3a782..aa60798d 100644 --- a/src/Forms/ContactForm.php +++ b/src/Forms/ContactForm.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Forms; use Phalcon\Forms\Element\Text; diff --git a/src/Forms/ProductTypesForm.php b/src/Forms/ProductTypesForm.php index 57a9e5d6..cbd8deef 100644 --- a/src/Forms/ProductTypesForm.php +++ b/src/Forms/ProductTypesForm.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Forms; use Phalcon\Forms\Form; diff --git a/src/Forms/ProductsForm.php b/src/Forms/ProductsForm.php index 6ed399a3..b9339033 100644 --- a/src/Forms/ProductsForm.php +++ b/src/Forms/ProductsForm.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Controllers; use Invo\Models\ProductTypes; diff --git a/src/Forms/RegisterForm.php b/src/Forms/RegisterForm.php index 38d518ce..6451eedf 100644 --- a/src/Forms/RegisterForm.php +++ b/src/Forms/RegisterForm.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Forms; use Phalcon\Forms\Element\Password; diff --git a/src/Models/Companies.php b/src/Models/Companies.php index 09b11979..40cddbce 100644 --- a/src/Models/Companies.php +++ b/src/Models/Companies.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Models; use Phalcon\Mvc\Model; diff --git a/src/Models/Contact.php b/src/Models/Contact.php index f3849049..e29c08bd 100644 --- a/src/Models/Contact.php +++ b/src/Models/Contact.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Models; use Phalcon\Db\RawValue; diff --git a/src/Models/ProductTypes.php b/src/Models/ProductTypes.php index d18a6b2d..607048c9 100644 --- a/src/Models/ProductTypes.php +++ b/src/Models/ProductTypes.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Models; use Phalcon\Mvc\Model; diff --git a/src/Models/Products.php b/src/Models/Products.php index c0d1c57b..54b0458a 100644 --- a/src/Models/Products.php +++ b/src/Models/Products.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Models; use Phalcon\Mvc\Model; diff --git a/src/Models/Users.php b/src/Models/Users.php index 95f11c42..7f9bb786 100644 --- a/src/Models/Users.php +++ b/src/Models/Users.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Models; use Phalcon\Mvc\Model; diff --git a/src/Plugins/ElementsPlugin.php b/src/Plugins/ElementsPlugin.php index 7be2d96a..6f2f4bf3 100644 --- a/src/Plugins/ElementsPlugin.php +++ b/src/Plugins/ElementsPlugin.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Plugins; use Phalcon\Di\Injectable; diff --git a/src/Plugins/NotFoundPlugin.php b/src/Plugins/NotFoundPlugin.php index a8ac66bf..36defa52 100644 --- a/src/Plugins/NotFoundPlugin.php +++ b/src/Plugins/NotFoundPlugin.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Plugins; use Exception; diff --git a/src/Plugins/SecurityPlugin.php b/src/Plugins/SecurityPlugin.php index 459a3c31..072afe86 100644 --- a/src/Plugins/SecurityPlugin.php +++ b/src/Plugins/SecurityPlugin.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Plugins; use Phalcon\Acl\Adapter\Memory as AclList; diff --git a/src/Providers/ConfigProvider.php b/src/Providers/ConfigProvider.php index f95c3f45..eb69165d 100644 --- a/src/Providers/ConfigProvider.php +++ b/src/Providers/ConfigProvider.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Providers; use Phalcon\Di\DiInterface; diff --git a/src/Providers/DatabaseProvider.php b/src/Providers/DatabaseProvider.php index eda8360a..8b784fbc 100644 --- a/src/Providers/DatabaseProvider.php +++ b/src/Providers/DatabaseProvider.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Providers; use Phalcon\Di\DiInterface; diff --git a/src/Providers/DispatcherProvider.php b/src/Providers/DispatcherProvider.php index 7a9d08c1..68a8529f 100644 --- a/src/Providers/DispatcherProvider.php +++ b/src/Providers/DispatcherProvider.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Providers; use Invo\Plugins\NotFoundPlugin; diff --git a/src/Providers/ElementsProvider.php b/src/Providers/ElementsProvider.php index cb7b60ef..ae283b07 100644 --- a/src/Providers/ElementsProvider.php +++ b/src/Providers/ElementsProvider.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Providers; use Invo\Plugins\ElementsPlugin; diff --git a/src/Providers/FlashProvider.php b/src/Providers/FlashProvider.php index 0f3fb1f5..5c5db917 100644 --- a/src/Providers/FlashProvider.php +++ b/src/Providers/FlashProvider.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Providers; use Phalcon\Di\DiInterface; diff --git a/src/Providers/SessionBagProvider.php b/src/Providers/SessionBagProvider.php index 218c58c9..285d9b28 100644 --- a/src/Providers/SessionBagProvider.php +++ b/src/Providers/SessionBagProvider.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Providers; use Phalcon\Di\DiInterface; diff --git a/src/Providers/SessionProvider.php b/src/Providers/SessionProvider.php index 1abd3413..da795b5c 100644 --- a/src/Providers/SessionProvider.php +++ b/src/Providers/SessionProvider.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Providers; use Phalcon\Di\DiInterface; diff --git a/src/Providers/UrlProvider.php b/src/Providers/UrlProvider.php index 063997fc..20cdad7c 100644 --- a/src/Providers/UrlProvider.php +++ b/src/Providers/UrlProvider.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Providers; use Phalcon\Di\DiInterface; diff --git a/src/Providers/ViewProvider.php b/src/Providers/ViewProvider.php index 0635fd3e..5af85ae5 100644 --- a/src/Providers/ViewProvider.php +++ b/src/Providers/ViewProvider.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Providers; use Phalcon\Di\DiInterface; diff --git a/src/Providers/VoltProvider.php b/src/Providers/VoltProvider.php index 21f83864..cc4e8393 100644 --- a/src/Providers/VoltProvider.php +++ b/src/Providers/VoltProvider.php @@ -1,6 +1,15 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Invo\Providers; use Phalcon\Di\DiInterface; From 62773d0fd1b207effc209fb81ccc850fa92debfd Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Fri, 20 Dec 2019 20:47:02 +0000 Subject: [PATCH 046/118] #76 - Rename file name of ProductTypesController class --- .../{ProducttypesController.php => ProductTypesController.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/Controllers/{ProducttypesController.php => ProductTypesController.php} (100%) diff --git a/src/Controllers/ProducttypesController.php b/src/Controllers/ProductTypesController.php similarity index 100% rename from src/Controllers/ProducttypesController.php rename to src/Controllers/ProductTypesController.php From 8f6d5f004b02b79d37e9c7b56873b84750a93c30 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Fri, 20 Dec 2019 20:49:44 +0000 Subject: [PATCH 047/118] #76 - Move view files from src/views/ to themes/invo/ folder --- .env.example | 2 +- {src/views => themes/invo}/about/index.volt | 0 {src/views => themes/invo}/companies/edit.volt | 0 {src/views => themes/invo}/companies/index.volt | 0 {src/views => themes/invo}/companies/new.volt | 0 {src/views => themes/invo}/companies/search.volt | 0 {src/views => themes/invo}/contact/index.volt | 0 {src/views => themes/invo}/errors/show401.volt | 0 {src/views => themes/invo}/errors/show404.volt | 0 {src/views => themes/invo}/errors/show500.volt | 0 {src/views => themes/invo}/index.volt | 0 {src/views => themes/invo}/index/index.volt | 0 {src/views => themes/invo}/invoices/index.volt | 0 {src/views => themes/invo}/invoices/profile.volt | 0 {src/views => themes/invo}/layouts/about.volt | 0 {src/views => themes/invo}/layouts/companies.volt | 0 {src/views => themes/invo}/layouts/contact.volt | 0 {src/views => themes/invo}/layouts/errors.volt | 0 {src/views => themes/invo}/layouts/index.volt | 0 {src/views => themes/invo}/layouts/invoices.volt | 0 {src/views => themes/invo}/layouts/main.volt | 0 {src/views => themes/invo}/layouts/products.volt | 0 {src/views => themes/invo}/layouts/producttypes.volt | 0 {src/views => themes/invo}/layouts/register.volt | 0 {src/views => themes/invo}/layouts/session.volt | 0 {src/views => themes/invo}/products/edit.volt | 0 {src/views => themes/invo}/products/index.volt | 0 {src/views => themes/invo}/products/new.volt | 0 {src/views => themes/invo}/products/search.volt | 0 {src/views => themes/invo}/producttypes/edit.volt | 0 {src/views => themes/invo}/producttypes/index.volt | 0 {src/views => themes/invo}/producttypes/new.volt | 0 {src/views => themes/invo}/producttypes/search.volt | 0 {src/views => themes/invo}/register/index.volt | 0 {src/views => themes/invo}/session/index.volt | 0 35 files changed, 1 insertion(+), 1 deletion(-) rename {src/views => themes/invo}/about/index.volt (100%) rename {src/views => themes/invo}/companies/edit.volt (100%) rename {src/views => themes/invo}/companies/index.volt (100%) rename {src/views => themes/invo}/companies/new.volt (100%) rename {src/views => themes/invo}/companies/search.volt (100%) rename {src/views => themes/invo}/contact/index.volt (100%) rename {src/views => themes/invo}/errors/show401.volt (100%) rename {src/views => themes/invo}/errors/show404.volt (100%) rename {src/views => themes/invo}/errors/show500.volt (100%) rename {src/views => themes/invo}/index.volt (100%) rename {src/views => themes/invo}/index/index.volt (100%) rename {src/views => themes/invo}/invoices/index.volt (100%) rename {src/views => themes/invo}/invoices/profile.volt (100%) rename {src/views => themes/invo}/layouts/about.volt (100%) rename {src/views => themes/invo}/layouts/companies.volt (100%) rename {src/views => themes/invo}/layouts/contact.volt (100%) rename {src/views => themes/invo}/layouts/errors.volt (100%) rename {src/views => themes/invo}/layouts/index.volt (100%) rename {src/views => themes/invo}/layouts/invoices.volt (100%) rename {src/views => themes/invo}/layouts/main.volt (100%) rename {src/views => themes/invo}/layouts/products.volt (100%) rename {src/views => themes/invo}/layouts/producttypes.volt (100%) rename {src/views => themes/invo}/layouts/register.volt (100%) rename {src/views => themes/invo}/layouts/session.volt (100%) rename {src/views => themes/invo}/products/edit.volt (100%) rename {src/views => themes/invo}/products/index.volt (100%) rename {src/views => themes/invo}/products/new.volt (100%) rename {src/views => themes/invo}/products/search.volt (100%) rename {src/views => themes/invo}/producttypes/edit.volt (100%) rename {src/views => themes/invo}/producttypes/index.volt (100%) rename {src/views => themes/invo}/producttypes/new.volt (100%) rename {src/views => themes/invo}/producttypes/search.volt (100%) rename {src/views => themes/invo}/register/index.volt (100%) rename {src/views => themes/invo}/session/index.volt (100%) diff --git a/.env.example b/.env.example index 4c921e35..7f1375b8 100644 --- a/.env.example +++ b/.env.example @@ -5,5 +5,5 @@ DB_PASSWORD= DB_DBNAME=invo DB_CHARSET=utf8 -VIEWS_DIR=src/views/ +VIEWS_DIR=themes/invo/ BASE_URI=/ diff --git a/src/views/about/index.volt b/themes/invo/about/index.volt similarity index 100% rename from src/views/about/index.volt rename to themes/invo/about/index.volt diff --git a/src/views/companies/edit.volt b/themes/invo/companies/edit.volt similarity index 100% rename from src/views/companies/edit.volt rename to themes/invo/companies/edit.volt diff --git a/src/views/companies/index.volt b/themes/invo/companies/index.volt similarity index 100% rename from src/views/companies/index.volt rename to themes/invo/companies/index.volt diff --git a/src/views/companies/new.volt b/themes/invo/companies/new.volt similarity index 100% rename from src/views/companies/new.volt rename to themes/invo/companies/new.volt diff --git a/src/views/companies/search.volt b/themes/invo/companies/search.volt similarity index 100% rename from src/views/companies/search.volt rename to themes/invo/companies/search.volt diff --git a/src/views/contact/index.volt b/themes/invo/contact/index.volt similarity index 100% rename from src/views/contact/index.volt rename to themes/invo/contact/index.volt diff --git a/src/views/errors/show401.volt b/themes/invo/errors/show401.volt similarity index 100% rename from src/views/errors/show401.volt rename to themes/invo/errors/show401.volt diff --git a/src/views/errors/show404.volt b/themes/invo/errors/show404.volt similarity index 100% rename from src/views/errors/show404.volt rename to themes/invo/errors/show404.volt diff --git a/src/views/errors/show500.volt b/themes/invo/errors/show500.volt similarity index 100% rename from src/views/errors/show500.volt rename to themes/invo/errors/show500.volt diff --git a/src/views/index.volt b/themes/invo/index.volt similarity index 100% rename from src/views/index.volt rename to themes/invo/index.volt diff --git a/src/views/index/index.volt b/themes/invo/index/index.volt similarity index 100% rename from src/views/index/index.volt rename to themes/invo/index/index.volt diff --git a/src/views/invoices/index.volt b/themes/invo/invoices/index.volt similarity index 100% rename from src/views/invoices/index.volt rename to themes/invo/invoices/index.volt diff --git a/src/views/invoices/profile.volt b/themes/invo/invoices/profile.volt similarity index 100% rename from src/views/invoices/profile.volt rename to themes/invo/invoices/profile.volt diff --git a/src/views/layouts/about.volt b/themes/invo/layouts/about.volt similarity index 100% rename from src/views/layouts/about.volt rename to themes/invo/layouts/about.volt diff --git a/src/views/layouts/companies.volt b/themes/invo/layouts/companies.volt similarity index 100% rename from src/views/layouts/companies.volt rename to themes/invo/layouts/companies.volt diff --git a/src/views/layouts/contact.volt b/themes/invo/layouts/contact.volt similarity index 100% rename from src/views/layouts/contact.volt rename to themes/invo/layouts/contact.volt diff --git a/src/views/layouts/errors.volt b/themes/invo/layouts/errors.volt similarity index 100% rename from src/views/layouts/errors.volt rename to themes/invo/layouts/errors.volt diff --git a/src/views/layouts/index.volt b/themes/invo/layouts/index.volt similarity index 100% rename from src/views/layouts/index.volt rename to themes/invo/layouts/index.volt diff --git a/src/views/layouts/invoices.volt b/themes/invo/layouts/invoices.volt similarity index 100% rename from src/views/layouts/invoices.volt rename to themes/invo/layouts/invoices.volt diff --git a/src/views/layouts/main.volt b/themes/invo/layouts/main.volt similarity index 100% rename from src/views/layouts/main.volt rename to themes/invo/layouts/main.volt diff --git a/src/views/layouts/products.volt b/themes/invo/layouts/products.volt similarity index 100% rename from src/views/layouts/products.volt rename to themes/invo/layouts/products.volt diff --git a/src/views/layouts/producttypes.volt b/themes/invo/layouts/producttypes.volt similarity index 100% rename from src/views/layouts/producttypes.volt rename to themes/invo/layouts/producttypes.volt diff --git a/src/views/layouts/register.volt b/themes/invo/layouts/register.volt similarity index 100% rename from src/views/layouts/register.volt rename to themes/invo/layouts/register.volt diff --git a/src/views/layouts/session.volt b/themes/invo/layouts/session.volt similarity index 100% rename from src/views/layouts/session.volt rename to themes/invo/layouts/session.volt diff --git a/src/views/products/edit.volt b/themes/invo/products/edit.volt similarity index 100% rename from src/views/products/edit.volt rename to themes/invo/products/edit.volt diff --git a/src/views/products/index.volt b/themes/invo/products/index.volt similarity index 100% rename from src/views/products/index.volt rename to themes/invo/products/index.volt diff --git a/src/views/products/new.volt b/themes/invo/products/new.volt similarity index 100% rename from src/views/products/new.volt rename to themes/invo/products/new.volt diff --git a/src/views/products/search.volt b/themes/invo/products/search.volt similarity index 100% rename from src/views/products/search.volt rename to themes/invo/products/search.volt diff --git a/src/views/producttypes/edit.volt b/themes/invo/producttypes/edit.volt similarity index 100% rename from src/views/producttypes/edit.volt rename to themes/invo/producttypes/edit.volt diff --git a/src/views/producttypes/index.volt b/themes/invo/producttypes/index.volt similarity index 100% rename from src/views/producttypes/index.volt rename to themes/invo/producttypes/index.volt diff --git a/src/views/producttypes/new.volt b/themes/invo/producttypes/new.volt similarity index 100% rename from src/views/producttypes/new.volt rename to themes/invo/producttypes/new.volt diff --git a/src/views/producttypes/search.volt b/themes/invo/producttypes/search.volt similarity index 100% rename from src/views/producttypes/search.volt rename to themes/invo/producttypes/search.volt diff --git a/src/views/register/index.volt b/themes/invo/register/index.volt similarity index 100% rename from src/views/register/index.volt rename to themes/invo/register/index.volt diff --git a/src/views/session/index.volt b/themes/invo/session/index.volt similarity index 100% rename from src/views/session/index.volt rename to themes/invo/session/index.volt From 0e50fe636e7bdd574873feedc5af33dedebcca1a Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Fri, 20 Dec 2019 20:50:32 +0000 Subject: [PATCH 048/118] #76 - Disable implicit flash --- src/Providers/FlashProvider.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Providers/FlashProvider.php b/src/Providers/FlashProvider.php index 5c5db917..92adba61 100644 --- a/src/Providers/FlashProvider.php +++ b/src/Providers/FlashProvider.php @@ -25,6 +25,7 @@ public function register(DiInterface $di): void { $di->setShared('flash', function () { $flash = new FlashDirect(); + $flash->setImplicitFlush(false); $flash->setCssClasses([ 'error' => 'alert alert-danger', 'success' => 'alert alert-success', From d79c920e7cc87d805391b59c444cd238fc4840c9 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Fri, 20 Dec 2019 20:50:57 +0000 Subject: [PATCH 049/118] #76 - Call session start() in Session Provider --- src/Providers/SessionProvider.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Providers/SessionProvider.php b/src/Providers/SessionProvider.php index da795b5c..ff5544fb 100644 --- a/src/Providers/SessionProvider.php +++ b/src/Providers/SessionProvider.php @@ -30,6 +30,7 @@ public function register(DiInterface $di): void 'savePath' => sys_get_temp_dir(), ]); $session->setAdapter($files); + $session->start(); return $session; }); From cb5eeb223de150a313faa856872f6f0e14043b2f Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Fri, 20 Dec 2019 20:52:07 +0000 Subject: [PATCH 050/118] #76 - Move LICENSE to root directory --- LICENSE | 29 +++++++++++++++++++++++++++++ docs/LICENSE.md | 15 --------------- docs/LICENSE.txt | 26 -------------------------- 3 files changed, 29 insertions(+), 41 deletions(-) create mode 100644 LICENSE delete mode 100644 docs/LICENSE.md delete mode 100644 docs/LICENSE.txt diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..ec3d6b00 --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +BSD 3-Clause License + +Copyright (c) 2013-2019, Phalcon PHP Framework +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/docs/LICENSE.md b/docs/LICENSE.md deleted file mode 100644 index e6306f75..00000000 --- a/docs/LICENSE.md +++ /dev/null @@ -1,15 +0,0 @@ - -New BSD License -=============== - -Copyright (c) 2012-2016, Phalcon Framework Team and contributors -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/docs/LICENSE.txt b/docs/LICENSE.txt deleted file mode 100644 index 9cb91c34..00000000 --- a/docs/LICENSE.txt +++ /dev/null @@ -1,26 +0,0 @@ -New BSD License - -Copyright (c) 2012-2016, Phalcon Framework Team and contributors -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From f147ae3277347e4364d0aa6676158e4b1ffcc51d Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Fri, 20 Dec 2019 20:54:26 +0000 Subject: [PATCH 051/118] #76 - Move from src/logs/ to var/logs/ --- {src => var}/logs/.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {src => var}/logs/.gitignore (100%) diff --git a/src/logs/.gitignore b/var/logs/.gitignore similarity index 100% rename from src/logs/.gitignore rename to var/logs/.gitignore From 414d96fd31aedbe70556b15dc58002d456331253 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Fri, 20 Dec 2019 21:01:29 +0000 Subject: [PATCH 052/118] #76 - Bootstrap Codeception --- codeception.yml | 10 ++++++++++ tests/_data/.gitkeep | 0 tests/_output/.gitignore | 2 ++ tests/_support/AcceptanceTester.php | 26 ++++++++++++++++++++++++++ tests/_support/FunctionalTester.php | 26 ++++++++++++++++++++++++++ tests/_support/Helper/Acceptance.php | 10 ++++++++++ tests/_support/Helper/Functional.php | 10 ++++++++++ tests/_support/Helper/Unit.php | 10 ++++++++++ tests/_support/UnitTester.php | 26 ++++++++++++++++++++++++++ tests/_support/_generated/.gitignore | 2 ++ tests/acceptance.suite.yml | 13 +++++++++++++ tests/functional.suite.yml | 13 +++++++++++++ tests/unit.suite.yml | 10 ++++++++++ 13 files changed, 158 insertions(+) create mode 100644 codeception.yml create mode 100644 tests/_data/.gitkeep create mode 100644 tests/_output/.gitignore create mode 100644 tests/_support/AcceptanceTester.php create mode 100644 tests/_support/FunctionalTester.php create mode 100644 tests/_support/Helper/Acceptance.php create mode 100644 tests/_support/Helper/Functional.php create mode 100644 tests/_support/Helper/Unit.php create mode 100644 tests/_support/UnitTester.php create mode 100644 tests/_support/_generated/.gitignore create mode 100644 tests/acceptance.suite.yml create mode 100644 tests/functional.suite.yml create mode 100644 tests/unit.suite.yml diff --git a/codeception.yml b/codeception.yml new file mode 100644 index 00000000..f0446cc8 --- /dev/null +++ b/codeception.yml @@ -0,0 +1,10 @@ +paths: + tests: tests + output: tests/_output + data: tests/_data + support: tests/_support + envs: tests/_envs +actor_suffix: Tester +extensions: + enabled: + - Codeception\Extension\RunFailed diff --git a/tests/_data/.gitkeep b/tests/_data/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/tests/_output/.gitignore b/tests/_output/.gitignore new file mode 100644 index 00000000..c96a04f0 --- /dev/null +++ b/tests/_output/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php new file mode 100644 index 00000000..95c00ec2 --- /dev/null +++ b/tests/_support/AcceptanceTester.php @@ -0,0 +1,26 @@ + Date: Fri, 20 Dec 2019 21:53:18 +0000 Subject: [PATCH 053/118] #76 - Fix return type of editAction() method --- src/Controllers/ProductsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controllers/ProductsController.php b/src/Controllers/ProductsController.php index 5ac7df31..145dc8c3 100644 --- a/src/Controllers/ProductsController.php +++ b/src/Controllers/ProductsController.php @@ -94,7 +94,7 @@ public function newAction(): void * * @param $id */ - public function editAction($id): void + public function editAction($id) { $product = Products::findFirstById($id); if (!$product) { From 7f8dd568a9eb5d8f75b891f886b724d72ebeb793 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Fri, 20 Dec 2019 21:53:52 +0000 Subject: [PATCH 054/118] #76 - Initialize Dotenv --- public/index.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/public/index.php b/public/index.php index 449dc6c0..e4a4deae 100644 --- a/public/index.php +++ b/public/index.php @@ -1,6 +1,7 @@ load(); + + /** + * Init Phalcon Dependency Injection + */ $di = new FactoryDefault(); $di->offsetSet('rootPath', function () use ($rootPath) { return $rootPath; }); + /** + * Register Service Providers + */ $providers = $rootPath . '/config/providers.php'; if (!file_exists($providers) || !is_readable($providers)) { throw new Exception('File providers.php does not exist or is not readable.'); @@ -24,6 +36,9 @@ $di->register(new $provider()); } + /** + * Init MVC Application and send output to client + */ (new Application($di)) ->handle($_SERVER['REQUEST_URI']) ->send(); From 29f9c588430e5223743ed768802f4ff1b1ca7ae4 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Fri, 20 Dec 2019 21:54:35 +0000 Subject: [PATCH 055/118] #76 - Add Controllers Unit tests --- tests/unit/Controllers/AboutControllerTest.php | 18 ++++++++++++++++++ .../Controllers/CompaniesControllerTest.php | 18 ++++++++++++++++++ .../unit/Controllers/ContactControllerTest.php | 18 ++++++++++++++++++ tests/unit/Controllers/ControllerBaseTest.php | 18 ++++++++++++++++++ .../unit/Controllers/ErrorsControllerTest.php | 18 ++++++++++++++++++ tests/unit/Controllers/IndexControllerTest.php | 18 ++++++++++++++++++ .../Controllers/InvoicesControllerTest.php | 18 ++++++++++++++++++ .../Controllers/ProductTypesControllerTest.php | 18 ++++++++++++++++++ .../Controllers/ProductsControllerTest.php | 18 ++++++++++++++++++ .../Controllers/RegisterControllerTest.php | 18 ++++++++++++++++++ .../unit/Controllers/SessionControllerTest.php | 18 ++++++++++++++++++ 11 files changed, 198 insertions(+) create mode 100644 tests/unit/Controllers/AboutControllerTest.php create mode 100644 tests/unit/Controllers/CompaniesControllerTest.php create mode 100644 tests/unit/Controllers/ContactControllerTest.php create mode 100644 tests/unit/Controllers/ControllerBaseTest.php create mode 100644 tests/unit/Controllers/ErrorsControllerTest.php create mode 100644 tests/unit/Controllers/IndexControllerTest.php create mode 100644 tests/unit/Controllers/InvoicesControllerTest.php create mode 100644 tests/unit/Controllers/ProductTypesControllerTest.php create mode 100644 tests/unit/Controllers/ProductsControllerTest.php create mode 100644 tests/unit/Controllers/RegisterControllerTest.php create mode 100644 tests/unit/Controllers/SessionControllerTest.php diff --git a/tests/unit/Controllers/AboutControllerTest.php b/tests/unit/Controllers/AboutControllerTest.php new file mode 100644 index 00000000..711c96f0 --- /dev/null +++ b/tests/unit/Controllers/AboutControllerTest.php @@ -0,0 +1,18 @@ +createMock(AboutController::class); + + $this->assertInstanceOf(Controller::class, $class); + } +} diff --git a/tests/unit/Controllers/CompaniesControllerTest.php b/tests/unit/Controllers/CompaniesControllerTest.php new file mode 100644 index 00000000..5c97b3b9 --- /dev/null +++ b/tests/unit/Controllers/CompaniesControllerTest.php @@ -0,0 +1,18 @@ +createMock(CompaniesController::class); + + $this->assertInstanceOf(Controller::class, $class); + } +} diff --git a/tests/unit/Controllers/ContactControllerTest.php b/tests/unit/Controllers/ContactControllerTest.php new file mode 100644 index 00000000..3e9819b4 --- /dev/null +++ b/tests/unit/Controllers/ContactControllerTest.php @@ -0,0 +1,18 @@ +createMock(ContactController::class); + + $this->assertInstanceOf(Controller::class, $class); + } +} diff --git a/tests/unit/Controllers/ControllerBaseTest.php b/tests/unit/Controllers/ControllerBaseTest.php new file mode 100644 index 00000000..764603a3 --- /dev/null +++ b/tests/unit/Controllers/ControllerBaseTest.php @@ -0,0 +1,18 @@ +createMock(ControllerBase::class); + + $this->assertInstanceOf(Controller::class, $class); + } +} diff --git a/tests/unit/Controllers/ErrorsControllerTest.php b/tests/unit/Controllers/ErrorsControllerTest.php new file mode 100644 index 00000000..08d52740 --- /dev/null +++ b/tests/unit/Controllers/ErrorsControllerTest.php @@ -0,0 +1,18 @@ +createMock(ErrorsController::class); + + $this->assertInstanceOf(Controller::class, $class); + } +} diff --git a/tests/unit/Controllers/IndexControllerTest.php b/tests/unit/Controllers/IndexControllerTest.php new file mode 100644 index 00000000..0535abe3 --- /dev/null +++ b/tests/unit/Controllers/IndexControllerTest.php @@ -0,0 +1,18 @@ +createMock(IndexController::class); + + $this->assertInstanceOf(Controller::class, $class); + } +} diff --git a/tests/unit/Controllers/InvoicesControllerTest.php b/tests/unit/Controllers/InvoicesControllerTest.php new file mode 100644 index 00000000..e47380a0 --- /dev/null +++ b/tests/unit/Controllers/InvoicesControllerTest.php @@ -0,0 +1,18 @@ +createMock(InvoicesController::class); + + $this->assertInstanceOf(Controller::class, $class); + } +} diff --git a/tests/unit/Controllers/ProductTypesControllerTest.php b/tests/unit/Controllers/ProductTypesControllerTest.php new file mode 100644 index 00000000..1b8f3f88 --- /dev/null +++ b/tests/unit/Controllers/ProductTypesControllerTest.php @@ -0,0 +1,18 @@ +createMock(ProductTypesController::class); + + $this->assertInstanceOf(Controller::class, $class); + } +} diff --git a/tests/unit/Controllers/ProductsControllerTest.php b/tests/unit/Controllers/ProductsControllerTest.php new file mode 100644 index 00000000..e59e2682 --- /dev/null +++ b/tests/unit/Controllers/ProductsControllerTest.php @@ -0,0 +1,18 @@ +createMock(ProductsController::class); + + $this->assertInstanceOf(Controller::class, $class); + } +} diff --git a/tests/unit/Controllers/RegisterControllerTest.php b/tests/unit/Controllers/RegisterControllerTest.php new file mode 100644 index 00000000..bea8a8b6 --- /dev/null +++ b/tests/unit/Controllers/RegisterControllerTest.php @@ -0,0 +1,18 @@ +createMock(RegisterController::class); + + $this->assertInstanceOf(Controller::class, $class); + } +} diff --git a/tests/unit/Controllers/SessionControllerTest.php b/tests/unit/Controllers/SessionControllerTest.php new file mode 100644 index 00000000..b6e3d6a4 --- /dev/null +++ b/tests/unit/Controllers/SessionControllerTest.php @@ -0,0 +1,18 @@ +createMock(SessionController::class); + + $this->assertInstanceOf(Controller::class, $class); + } +} From 46887db3d6fc434d5c0332cab18a56839ae3e03a Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 21 Dec 2019 11:41:43 +0000 Subject: [PATCH 056/118] #76 - Move cache/ inside var/ folder --- src/Providers/VoltProvider.php | 2 +- {cache => var/cache}/volt/.gitignore | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {cache => var/cache}/volt/.gitignore (100%) diff --git a/src/Providers/VoltProvider.php b/src/Providers/VoltProvider.php index cc4e8393..204d1a3c 100644 --- a/src/Providers/VoltProvider.php +++ b/src/Providers/VoltProvider.php @@ -25,7 +25,7 @@ public function register(DiInterface $di): void $di->setShared('volt', function () use ($view, $di) { $volt = new VoltEngine($view, $di); $volt->setOptions([ - 'path' => $di->offsetGet('rootPath') . '/cache/volt/', + 'path' => $di->offsetGet('rootPath') . '/var/cache/volt/', ]); $compiler = $volt->getCompiler(); diff --git a/cache/volt/.gitignore b/var/cache/volt/.gitignore similarity index 100% rename from cache/volt/.gitignore rename to var/cache/volt/.gitignore From 45edbe6c49a0b1fbda67af77464881c08fc3593e Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 21 Dec 2019 13:25:05 +0000 Subject: [PATCH 057/118] #76 - Mass refactor of controller classes --- src/Controllers/CompaniesController.php | 76 +++++++++++++--------- src/Controllers/ContactController.php | 22 ++++--- src/Controllers/InvoicesController.php | 6 +- src/Controllers/ProductTypesController.php | 73 +++++++++++++-------- src/Controllers/ProductsController.php | 74 ++++++++++++--------- src/Controllers/RegisterController.php | 10 +-- src/Controllers/SessionController.php | 14 ++-- 7 files changed, 167 insertions(+), 108 deletions(-) diff --git a/src/Controllers/CompaniesController.php b/src/Controllers/CompaniesController.php index 83f30246..6c614669 100644 --- a/src/Controllers/CompaniesController.php +++ b/src/Controllers/CompaniesController.php @@ -29,18 +29,16 @@ public function initialize() /** * Shows the index action */ - public function indexAction() + public function indexAction(): void { - $this->session->conditions = null; - $this->view->form = new CompaniesForm; + $this->view->form = new CompaniesForm(); } /** * Search companies based on current criteria */ - public function searchAction() + public function searchAction(): void { - $numberPage = 1; if ($this->request->isPost()) { $query = Criteria::fromInput( $this->di, @@ -49,8 +47,6 @@ public function searchAction() ); $this->persistent->searchParams = $query->getParams(); - } else { - $numberPage = $this->request->getQuery('page', 'int'); } $parameters = []; @@ -62,16 +58,18 @@ public function searchAction() if (count($companies) == 0) { $this->flash->notice('The search did not find any companies'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'companies', 'action' => 'index', ]); + + return; } $paginator = new Paginator([ 'data' => $companies, 'limit' => 10, - 'page' => $numberPage, + 'page' => $this->request->getQuery('page', 'int', 1), ]); $this->view->page = $paginator->paginate(); @@ -81,7 +79,7 @@ public function searchAction() /** * Shows the form to create a new company */ - public function newAction() + public function newAction(): void { $this->view->form = new CompaniesForm(null, ['edit' => true]); } @@ -91,16 +89,18 @@ public function newAction() * * @param int $id */ - public function editAction($id) + public function editAction($id): void { $company = Companies::findFirstById($id); if (!$company) { $this->flash->error('Company was not found'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'companies', 'action' => 'index', ]); + + return; } $this->view->form = new CompaniesForm($company, ['edit' => true]); @@ -109,16 +109,18 @@ public function editAction($id) /** * Creates a new company */ - public function createAction() + public function createAction(): void { if (!$this->request->isPost()) { - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'companies', 'action' => 'index', ]); + + return; } - $form = new CompaniesForm; + $form = new CompaniesForm(); $company = new Companies(); $data = $this->request->getPost(); @@ -127,10 +129,12 @@ public function createAction() $this->flash->error($message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'companies', 'action' => 'new', ]); + + return; } if (!$company->save()) { @@ -138,17 +142,18 @@ public function createAction() $this->flash->error((string)$message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'companies', 'action' => 'new', ]); + + return; } $form->clear(); - $this->flash->success('Company was created successfully'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'companies', 'action' => 'index', ]); @@ -157,13 +162,15 @@ public function createAction() /** * Saves current company in screen */ - public function saveAction() + public function saveAction(): void { if (!$this->request->isPost()) { - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'companies', 'action' => 'index', ]); + + return; } $id = $this->request->getPost('id', 'int'); @@ -171,23 +178,27 @@ public function saveAction() if (!$company) { $this->flash->error('Company does not exist'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'companies', 'action' => 'index', ]); + + return; } $data = $this->request->getPost(); - $form = new CompaniesForm; + $form = new CompaniesForm(); if (!$form->isValid($data, $company)) { foreach ($form->getMessages() as $message) { $this->flash->error($message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'companies', 'action' => 'new', ]); + + return; } if (!$company->save()) { @@ -195,17 +206,18 @@ public function saveAction() $this->flash->error($message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'companies', 'action' => 'new', ]); + + return; } $form->clear(); - $this->flash->success('Company was updated successfully'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'companies', 'action' => 'index', ]); @@ -222,10 +234,12 @@ public function deleteAction($id) if (!$companies) { $this->flash->error('Company was not found'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'companies', 'action' => 'index', ]); + + return; } if (!$companies->delete()) { @@ -233,15 +247,17 @@ public function deleteAction($id) $this->flash->error($message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'companies', 'action' => 'search', ]); + + return; } $this->flash->success('Company was deleted'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'companies', 'action' => 'index', ]); diff --git a/src/Controllers/ContactController.php b/src/Controllers/ContactController.php index 285ae71f..eb6ab860 100644 --- a/src/Controllers/ContactController.php +++ b/src/Controllers/ContactController.php @@ -37,30 +37,32 @@ public function indexAction(): void /** * Saves the contact information in the database */ - public function sendAction() + public function sendAction(): void { if (!$this->request->isPost()) { - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'contact', 'action' => 'index', ]); + + return; } - $form = new ContactForm; + $form = new ContactForm(); $contact = new Contact(); - $data = $this->request->getPost(); - // Validate the form - if (!$form->isValid($data, $contact)) { + if (!$form->isValid($this->request->getPost(), $contact)) { foreach ($form->getMessages() as $message) { $this->flash->error((string)$message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'contact', 'action' => 'index', ]); + + return; } if (!$contact->save()) { @@ -68,15 +70,17 @@ public function sendAction() $this->flash->error((string)$message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'contact', 'action' => 'index', ]); + + return; } $this->flash->success('Thanks, we will contact you in the next few hours'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'index', 'action' => 'index', ]); diff --git a/src/Controllers/InvoicesController.php b/src/Controllers/InvoicesController.php index 2cefb419..c6566eb3 100644 --- a/src/Controllers/InvoicesController.php +++ b/src/Controllers/InvoicesController.php @@ -35,7 +35,7 @@ public function indexAction(): void /** * Edit the active user profile */ - public function profileAction() + public function profileAction(): void { //Get session info $auth = $this->session->get('auth'); @@ -43,10 +43,12 @@ public function profileAction() //Query the active user $user = Users::findFirst($auth['id']); if (!$user) { - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'index', 'action' => 'index', ]); + + return; } if (!$this->request->isPost()) { diff --git a/src/Controllers/ProductTypesController.php b/src/Controllers/ProductTypesController.php index 2bfac092..ad830faa 100644 --- a/src/Controllers/ProductTypesController.php +++ b/src/Controllers/ProductTypesController.php @@ -36,16 +36,14 @@ public function initialize() */ public function indexAction(): void { - $this->session->conditions = null; $this->view->form = new ProductTypesForm; } /** * Search producttype based on current criteria */ - public function searchAction() + public function searchAction(): void { - $numberPage = 1; if ($this->request->isPost()) { $query = Criteria::fromInput( $this->di, @@ -54,8 +52,6 @@ public function searchAction() ); $this->persistent->searchParams = $query->getParams(); - } else { - $numberPage = $this->request->getQuery('page', 'int'); } $parameters = []; @@ -67,16 +63,18 @@ public function searchAction() if (count($productTypes) === 0) { $this->flash->notice('The search did not find any product types'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'producttypes', 'action' => 'index', ]); + + return; } $paginator = new Paginator([ 'data' => $productTypes, 'limit' => 10, - 'page' => $numberPage, + 'page' => $this->request->getQuery('page', 'int', 1), ]); $this->view->page = $paginator->paginate(); @@ -96,16 +94,18 @@ public function newAction(): void * * @param int $id */ - public function editAction($id) + public function editAction($id): void { $productTypes = ProductTypes::findFirstById($id); if (!$productTypes) { $this->flash->error('Product type to edit was not found'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'producttypes', 'action' => 'index', ]); + + return; } $this->view->form = new ProductTypesForm($productTypes, ['edit' => true]); @@ -114,16 +114,18 @@ public function editAction($id) /** * Creates a new producttype */ - public function createAction() + public function createAction(): void { if (!$this->request->isPost()) { - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'producttypes', 'action' => 'index', ]); + + return; } - $form = new ProductTypesForm; + $form = new ProductTypesForm(); $productTypes = new ProductTypes(); $data = $this->request->getPost(); @@ -132,10 +134,12 @@ public function createAction() $this->flash->error((string)$message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'producttypes', 'action' => 'new', ]); + + return; } if (!$productTypes->save()) { @@ -143,16 +147,18 @@ public function createAction() $this->flash->error((string)$message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'producttypes', 'action' => 'new', ]); + + return; } $form->clear(); $this->flash->success('Product type was created successfully'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'producttypes', 'action' => 'index', ]); @@ -161,13 +167,15 @@ public function createAction() /** * Saves current producttypes in screen */ - public function saveAction() + public function saveAction(): void { if (!$this->request->isPost()) { - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'producttypes', 'action' => 'index', ]); + + return; } $id = $this->request->getPost('id', 'int'); @@ -175,23 +183,26 @@ public function saveAction() if (!$productTypes) { $this->flash->error('productTypes does not exist'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'producttypes', 'action' => 'index', ]); + + return; } - $form = new ProductTypesForm; - $data = $this->request->getPost(); - if (!$form->isValid($data, $productTypes)) { + $form = new ProductTypesForm(); + if (!$form->isValid($this->request->getPost(), $productTypes)) { foreach ($form->getMessages() as $message) { $this->flash->error($message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'producttypes', 'action' => 'new', ]); + + return; } if (!$productTypes->save()) { @@ -199,16 +210,18 @@ public function saveAction() $this->flash->error($message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'producttypes', 'action' => 'new', ]); + + return; } $form->clear(); $this->flash->success('Product Type was updated successfully'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'producttypes', 'action' => 'index', ]); @@ -219,16 +232,18 @@ public function saveAction() * * @param int $id */ - public function deleteAction($id) + public function deleteAction($id): void { $productTypes = ProductTypes::findFirstById($id); if (!$productTypes) { $this->flash->error('Product types was not found'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'producttypes', 'action' => 'index', ]); + + return; } if (!$productTypes->delete()) { @@ -236,15 +251,17 @@ public function deleteAction($id) $this->flash->error((string)$message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'producttypes', 'action' => 'search', ]); + + return; } $this->flash->success('product types was deleted'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'producttypes', 'action' => 'index', ]); diff --git a/src/Controllers/ProductsController.php b/src/Controllers/ProductsController.php index 145dc8c3..c2a62bb5 100644 --- a/src/Controllers/ProductsController.php +++ b/src/Controllers/ProductsController.php @@ -35,16 +35,14 @@ public function initialize() */ public function indexAction(): void { - $this->session->conditions = null; $this->view->form = new ProductsForm; } /** * Search products based on current criteria */ - public function searchAction() + public function searchAction(): void { - $numberPage = 1; if ($this->request->isPost()) { $query = Criteria::fromInput( $this->di, @@ -53,8 +51,6 @@ public function searchAction() ); $this->persistent->searchParams = $query->getParams(); - } else { - $numberPage = $this->request->getQuery('page', 'int'); } $parameters = []; @@ -66,16 +62,18 @@ public function searchAction() if (count($products) == 0) { $this->flash->notice('The search did not find any products'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'products', 'action' => 'index', ]); + + return; } $paginator = new Paginator([ 'data' => $products, 'limit' => 10, - 'page' => $numberPage, + 'page' => $this->request->getQuery('page', 'int', 1), ]); $this->view->page = $paginator->paginate(); @@ -94,16 +92,18 @@ public function newAction(): void * * @param $id */ - public function editAction($id) + public function editAction($id): void { $product = Products::findFirstById($id); if (!$product) { $this->flash->error('Product was not found'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'products', 'action' => 'index', ]); + + return; } $this->view->form = new ProductsForm($product, ['edit' => true]); @@ -112,29 +112,31 @@ public function editAction($id) /** * Creates a new product */ - public function createAction() + public function createAction(): void { if (!$this->request->isPost()) { - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'products', 'action' => 'index', ]); + + return; } - $form = new ProductsForm; + $form = new ProductsForm(); $product = new Products(); - $data = $this->request->getPost(); - - if (!$form->isValid($data, $product)) { + if (!$form->isValid($this->request->getPost(), $product)) { foreach ($form->getMessages() as $message) { $this->flash->error($message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'products', 'action' => 'new', ]); + + return; } if (!$product->save()) { @@ -142,16 +144,18 @@ public function createAction() $this->flash->error((string)$message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'products', 'action' => 'new', ]); + + return; } $form->clear(); $this->flash->success('Product was created successfully'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'products', 'action' => 'index', ]); @@ -160,13 +164,15 @@ public function createAction() /** * Saves current product in screen */ - public function saveAction() + public function saveAction(): void { if (!$this->request->isPost()) { - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'products', 'action' => 'index', ]); + + return; } $id = $this->request->getPost('id', 'int'); @@ -174,13 +180,15 @@ public function saveAction() if (!$product) { $this->flash->error('Product does not exist'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'products', 'action' => 'index', ]); + + return; } - $form = new ProductsForm; + $form = new ProductsForm(); $this->view->form = $form; $data = $this->request->getPost(); @@ -189,11 +197,13 @@ public function saveAction() $this->flash->error($message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'products', 'action' => 'edit', 'params' => [$id], ]); + + return; } if (!$product->save()) { @@ -201,17 +211,19 @@ public function saveAction() $this->flash->error($message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'products', 'action' => 'edit', 'params' => [$id], ]); + + return; } $form->clear(); $this->flash->success('Product was updated successfully'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'products', 'action' => 'index', ]); @@ -222,16 +234,18 @@ public function saveAction() * * @param string $id */ - public function deleteAction($id) + public function deleteAction($id): void { $products = Products::findFirstById($id); if (!$products) { $this->flash->error('Product was not found'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'products', 'action' => 'index', ]); + + return; } if (!$products->delete()) { @@ -239,15 +253,17 @@ public function deleteAction($id) $this->flash->error($message); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'products', 'action' => 'search', ]); + + return; } $this->flash->success('Product was deleted'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'products', 'action' => 'index', ]); diff --git a/src/Controllers/RegisterController.php b/src/Controllers/RegisterController.php index 4422e0c1..bad15563 100644 --- a/src/Controllers/RegisterController.php +++ b/src/Controllers/RegisterController.php @@ -33,9 +33,9 @@ public function initialize() /** * Action to register a new user */ - public function indexAction() + public function indexAction(): void { - $form = new RegisterForm; + $form = new RegisterForm(); if ($this->request->isPost()) { $password = $this->request->getPost('password'); @@ -44,7 +44,7 @@ public function indexAction() if ($password !== $repeatPassword) { $this->flash->error('Passwords are different'); - return false; + return; } $user = new Users(); @@ -65,10 +65,12 @@ public function indexAction() $this->flash->success('Thanks for sign-up, please log-in to start generating invoices'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'session', 'action' => 'index', ]); + + return; } } diff --git a/src/Controllers/SessionController.php b/src/Controllers/SessionController.php index 092e8e47..3575b2cf 100644 --- a/src/Controllers/SessionController.php +++ b/src/Controllers/SessionController.php @@ -37,7 +37,7 @@ public function indexAction(): void /** * This action authenticate and logs an user into the application */ - public function startAction() + public function startAction(): void { if ($this->request->isPost()) { $email = $this->request->getPost('email'); @@ -56,16 +56,18 @@ public function startAction() $this->registerSession($user); $this->flash->success('Welcome ' . $user->name); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'invoices', 'action' => 'index', ]); + + return; } $this->flash->error('Wrong email/password'); } - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'session', 'action' => 'index', ]); @@ -74,12 +76,12 @@ public function startAction() /** * Finishes the active session redirecting to the index */ - public function endAction() + public function endAction(): void { $this->session->remove('auth'); $this->flash->success('Goodbye!'); - return $this->dispatcher->forward([ + $this->dispatcher->forward([ 'controller' => 'index', 'action' => 'index', ]); @@ -90,7 +92,7 @@ public function endAction() * * @param Users $user */ - private function registerSession(Users $user) + private function registerSession(Users $user): void { $this->session->set('auth', [ 'id' => $user->id, From ff2b3a444a389b7a0f3126ca74eaaa7ff70b2740 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sat, 21 Dec 2019 15:07:25 +0000 Subject: [PATCH 058/118] #76 - Update README.md --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ff9cc94d..84f38379 100644 --- a/README.md +++ b/README.md @@ -21,10 +21,10 @@ switch to the relevant branch. ### Requirements -* PHP >= 5.4 +* PHP >= 7.2 * [Apache][2] Web Server with [mod_rewrite][3] enabled or [Nginx][4] Web Server * Latest stable [Phalcon Framework release][5] extension enabled -* [MySQL][6] >= 5.1.5 +* [MySQL][6] >= 5.5 ### Installation @@ -37,12 +37,9 @@ $ git clone git@github.com:phalcon/invo.git Then you'll need to create the database and initialize schema: ```sh -$ echo 'CREATE DATABASE invo CHARSET=utf8 COLLATE=utf8_unicode_ci' | mysql -u root -$ cat schemas/invo.sql | mysql -u root invo +vendor/bin/phalcon-migrations --log-in-db --config=migrations.php ``` -Also you can override application config by creating `app/config/config.ini.dev` (already gitignored). - ## Contributing See [CONTRIBUTING.md][7] From bb7a972ba6f53609077a9db22d639bcc8b815d09 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Fri, 27 Dec 2019 21:13:18 +0000 Subject: [PATCH 059/118] #76 - Refactor in views --- themes/invo/companies/edit.volt | 4 +--- themes/invo/companies/index.volt | 4 +--- themes/invo/companies/new.volt | 6 +----- themes/invo/companies/search.volt | 2 -- themes/invo/contact/index.volt | 4 +--- themes/invo/errors/show401.volt | 2 -- themes/invo/errors/show404.volt | 2 -- themes/invo/errors/show500.volt | 2 -- themes/invo/index/index.volt | 2 -- themes/invo/invoices/profile.volt | 5 +---- themes/invo/layouts/about.volt | 1 + themes/invo/layouts/companies.volt | 1 + themes/invo/layouts/contact.volt | 1 + themes/invo/layouts/errors.volt | 1 + themes/invo/layouts/index.volt | 1 + themes/invo/layouts/invoices.volt | 1 + themes/invo/layouts/products.volt | 1 + themes/invo/layouts/producttypes.volt | 1 + themes/invo/layouts/register.volt | 1 + themes/invo/layouts/session.volt | 1 + themes/invo/products/edit.volt | 8 +------- themes/invo/products/index.volt | 2 -- themes/invo/products/new.volt | 28 +++++++++++---------------- themes/invo/products/search.volt | 2 -- themes/invo/producttypes/edit.volt | 4 +--- themes/invo/producttypes/index.volt | 4 +--- themes/invo/producttypes/new.volt | 4 +--- themes/invo/producttypes/search.volt | 2 -- themes/invo/register/index.volt | 4 +--- themes/invo/session/index.volt | 5 ++--- 30 files changed, 33 insertions(+), 73 deletions(-) diff --git a/themes/invo/companies/edit.volt b/themes/invo/companies/edit.volt index 97a87587..de141d22 100644 --- a/themes/invo/companies/edit.volt +++ b/themes/invo/companies/edit.volt @@ -1,4 +1,4 @@ -{{ form("companies/save", 'role': 'form') }} +
        - {{ content() }} -

        Edit companies

        diff --git a/themes/invo/companies/index.volt b/themes/invo/companies/index.volt index 5c9633d7..06202a0d 100644 --- a/themes/invo/companies/index.volt +++ b/themes/invo/companies/index.volt @@ -1,10 +1,8 @@ -{{ content() }} -
        {{ link_to("companies/new", "Create Companies", "class": "btn btn-primary") }}
        -{{ form("companies/search") }} +

        Search companies

        diff --git a/themes/invo/companies/new.volt b/themes/invo/companies/new.volt index dc5d3305..406376b1 100644 --- a/themes/invo/companies/new.volt +++ b/themes/invo/companies/new.volt @@ -1,6 +1,4 @@ -{{ content() }} - -{{ form("companies/create") }} +
        - {% for element in form %} {% if is_a(element, 'Phalcon\Forms\Element\Hidden') %} {{ element }} @@ -22,6 +19,5 @@
    {% endif %} {% endfor %} - diff --git a/themes/invo/companies/search.volt b/themes/invo/companies/search.volt index 82a545f8..b23dfdc6 100644 --- a/themes/invo/companies/search.volt +++ b/themes/invo/companies/search.volt @@ -1,5 +1,3 @@ -{{ content() }} -