From 51f289359bd11a72ba35cdfaee5ec053aeb21ec1 Mon Sep 17 00:00:00 2001 From: Amos Folz Date: Mon, 1 Apr 2019 00:25:54 +0000 Subject: [PATCH 01/16] Replace FA4 with FA5. Replace aliased icons (aliasing is deprecated in FA5) Apply fix to AdminLTE to work with FA5 --- .../templates/navigation/sidebar-menu.html.twig | 6 +++--- .../templates/pages/abstract/dashboard.html.twig | 2 +- .../admin/templates/pages/dashboard.html.twig | 2 +- app/sprinkles/admin/templates/pages/role.html.twig | 2 +- app/sprinkles/admin/templates/pages/roles.html.twig | 2 +- app/sprinkles/admin/templates/pages/user.html.twig | 4 ++-- .../admin/templates/tables/users.html.twig | 2 +- app/sprinkles/core/asset-bundles.json | 2 +- .../core/assets/userfrosting/css/AdminLTE.css | 3 ++- app/sprinkles/core/package.json | 13 ++++++------- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig b/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig index e6d4a7cc1..a579ec4d6 100644 --- a/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig +++ b/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig @@ -1,7 +1,7 @@ {% block navigation %} {% if checkAccess('uri_dashboard') %}
  • - {{ translate("DASHBOARD") }} + {{ translate("DASHBOARD") }}
    • {% endif %} {% if checkAccess('uri_users') %} @@ -22,7 +22,7 @@ {% endif %} {% if checkAccess('uri_roles') %}
  • - {{ translate("ROLE", 2) }} + {{ translate("ROLE", 2) }}
    • {% endif %} {% if checkAccess('uri_permissions') %} @@ -35,4 +35,4 @@ {{ translate("GROUP", 2) }} {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig b/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig index 2a53de456..3188a348a 100644 --- a/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig +++ b/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig @@ -84,4 +84,4 @@ {% block scripts_page_group %} {{ assets.js('js/admin') | raw }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/sprinkles/admin/templates/pages/dashboard.html.twig b/app/sprinkles/admin/templates/pages/dashboard.html.twig index f9c85a34b..630b23e25 100644 --- a/app/sprinkles/admin/templates/pages/dashboard.html.twig +++ b/app/sprinkles/admin/templates/pages/dashboard.html.twig @@ -26,7 +26,7 @@
    - +
    {{ translate("ROLE", 2) }} {{counter.roles}} diff --git a/app/sprinkles/admin/templates/pages/role.html.twig b/app/sprinkles/admin/templates/pages/role.html.twig index fa8983814..aa79cf5b6 100644 --- a/app/sprinkles/admin/templates/pages/role.html.twig +++ b/app/sprinkles/admin/templates/pages/role.html.twig @@ -51,7 +51,7 @@
    - +

    {{role.name}}

    diff --git a/app/sprinkles/admin/templates/pages/roles.html.twig b/app/sprinkles/admin/templates/pages/roles.html.twig index c5b399556..c8ff090c0 100644 --- a/app/sprinkles/admin/templates/pages/roles.html.twig +++ b/app/sprinkles/admin/templates/pages/roles.html.twig @@ -15,7 +15,7 @@
    -

    {{translate('ROLE', 2)}}

    +

    {{translate('ROLE', 2)}}

    {% include "tables/table-tool-menu.html.twig" %}
    diff --git a/app/sprinkles/admin/templates/pages/user.html.twig b/app/sprinkles/admin/templates/pages/user.html.twig index 16522084a..de6bcbf6f 100644 --- a/app/sprinkles/admin/templates/pages/user.html.twig +++ b/app/sprinkles/admin/templates/pages/user.html.twig @@ -43,7 +43,7 @@ {% if 'roles' not in tools.hidden %}
  • - {{translate('ROLE', 2)}} + {{translate('ROLE', 2)}}
    • {% endif %} @@ -117,7 +117,7 @@ {% if 'roles' not in fields.hidden %}
    - {{translate("ROLE", 2)}} + {{translate("ROLE", 2)}}

    {% for role in user.roles %} {{role.name}} diff --git a/app/sprinkles/admin/templates/tables/users.html.twig b/app/sprinkles/admin/templates/tables/users.html.twig index 1cebb47e2..cf1ae228a 100644 --- a/app/sprinkles/admin/templates/tables/users.html.twig +++ b/app/sprinkles/admin/templates/tables/users.html.twig @@ -109,7 +109,7 @@

  • - {% endverbatim %}{{translate("ROLE.MANAGE")}}{% verbatim %} + {% endverbatim %}{{translate("ROLE.MANAGE")}}{% verbatim %}
  • diff --git a/app/sprinkles/core/asset-bundles.json b/app/sprinkles/core/asset-bundles.json index 5dfeac792..02b28b1e3 100644 --- a/app/sprinkles/core/asset-bundles.json +++ b/app/sprinkles/core/asset-bundles.json @@ -45,7 +45,7 @@ }, "css/main": { "styles": [ - "vendor/font-awesome/css/font-awesome.css", + "vendor/@fortawesome/fontawesome-free/css/all.css", "vendor/bootstrap/dist/css/bootstrap.css", "vendor/select2/dist/css/select2.css", "vendor/icheck/skins/square/_all.css", diff --git a/app/sprinkles/core/assets/userfrosting/css/AdminLTE.css b/app/sprinkles/core/assets/userfrosting/css/AdminLTE.css index 103689d41..9aef04a34 100644 --- a/app/sprinkles/core/assets/userfrosting/css/AdminLTE.css +++ b/app/sprinkles/core/assets/userfrosting/css/AdminLTE.css @@ -255,7 +255,8 @@ a:focus { background-color: transparent; background-image: none; padding: 15px 15px; - font-family: fontAwesome; + font-family: "Font Awesome 5 Free"; + font-weight: 900; } .main-header .sidebar-toggle:before { content: "\f0c9"; diff --git a/app/sprinkles/core/package.json b/app/sprinkles/core/package.json index cb2526ebd..2d629516d 100644 --- a/app/sprinkles/core/package.json +++ b/app/sprinkles/core/package.json @@ -3,19 +3,18 @@ "dependencies": { "bootstrap": "^3.3.6", "clipboard": "^1.5.16", - "font-awesome": "^4.7.0", + "fastclick": "^1.0.6", "handlebars": "^3.0.3", + "icheck": "^1.0.1", + "ionicons": "^2.0.1", "jquery": "^3.2.1", + "jquery-slimscroll": "~1.3.8", "jquery-ui": "^1.12.0", "jquery-validation": "~1.14.0", - "select2": "^4.0.5", - "tablesorter": "^2.28.5", "moment": "^2.17.1", + "select2": "^4.0.5", "speakingurl": "^11.0.0", - "icheck": "^1.0.1", - "jquery-slimscroll": "~1.3.8", - "fastclick": "^1.0.6", - "ionicons": "^2.0.1", + "tablesorter": "^2.28.5", "urijs": "^1.18.4" } } From 0a9e12e20116c32cc8456286a2f46d20f8ecb76f Mon Sep 17 00:00:00 2001 From: Amos Folz Date: Mon, 1 Apr 2019 00:45:55 +0000 Subject: [PATCH 02/16] Update FA5 icon prefix 'fa' to 'fas' to align with new conventions --- .../Database/Migrations/v400/GroupsTable.php | 2 +- .../forms/settings-account.html.twig | 2 +- .../forms/settings-profile.html.twig | 2 +- .../templates/navigation/user-card.html.twig | 2 +- .../pages/error/compromised.html.twig | 2 +- .../admin/src/Controller/GroupController.php | 2 +- .../admin/templates/forms/group.html.twig | 4 +-- .../admin/templates/forms/role.html.twig | 4 +-- .../admin/templates/forms/user.html.twig | 16 ++++----- .../modals/role-manage-permissions.html.twig | 2 +- .../modals/user-manage-roles.html.twig | 2 +- .../modals/user-set-password.html.twig | 4 +-- .../navigation/sidebar-menu.html.twig | 12 +++---- .../pages/abstract/dashboard.html.twig | 2 +- .../templates/pages/activities.html.twig | 2 +- .../admin/templates/pages/dashboard.html.twig | 16 ++++----- .../admin/templates/pages/group.html.twig | 10 +++--- .../admin/templates/pages/groups.html.twig | 4 +-- .../templates/pages/permission.html.twig | 6 ++-- .../templates/pages/permissions.html.twig | 2 +- .../admin/templates/pages/role.html.twig | 16 ++++----- .../admin/templates/pages/roles.html.twig | 4 +-- .../admin/templates/pages/user.html.twig | 32 ++++++++--------- .../admin/templates/pages/users.html.twig | 4 +-- .../templates/tables/activities.html.twig | 8 ++--- .../admin/templates/tables/groups.html.twig | 8 ++--- .../templates/tables/permissions.html.twig | 4 +-- .../admin/templates/tables/roles.html.twig | 10 +++--- .../admin/templates/tables/users.html.twig | 22 ++++++------ .../core/assets/userfrosting/css/AdminLTE.css | 12 +++---- .../assets/userfrosting/css/userfrosting.css | 2 +- .../core/assets/userfrosting/js/AdminLTE.js | 2 +- .../core/assets/userfrosting/js/uf-form.js | 2 +- .../js/uf-jqueryvalidation-config.js | 2 +- .../core/assets/userfrosting/js/uf-table.js | 14 ++++---- .../core/src/Util/CheckEnvironment.php | 26 +++++++------- .../templates/navigation/breadcrumb.html.twig | 2 +- .../templates/navigation/main-nav.html.twig | 2 +- .../core/templates/pages/about.html.twig | 36 +++++++++---------- .../templates/pages/abstract/error.html.twig | 4 +-- .../core/templates/pages/error/400.html.twig | 2 +- .../core/templates/pages/error/404.html.twig | 2 +- .../pages/error/config-errors.html.twig | 2 +- .../core/templates/pages/index.html.twig | 10 +++--- .../templates/pages/partials/alerts.html.twig | 2 +- .../tables/table-paginated.html.twig | 12 +++---- .../tables/table-tool-menu.html.twig | 4 +-- 47 files changed, 172 insertions(+), 172 deletions(-) diff --git a/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php b/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php index 937aa67c8..429bbb0b4 100644 --- a/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php +++ b/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php @@ -34,7 +34,7 @@ public function up() $table->string('slug'); $table->string('name'); $table->text('description')->nullable(); - $table->string('icon', 100)->nullable(false)->default('fa fa-user')->comment('The icon representing users in this group.'); + $table->string('icon', 100)->nullable(false)->default('fas fa-user')->comment('The icon representing users in this group.'); $table->timestamps(); $table->engine = 'InnoDB'; diff --git a/app/sprinkles/account/templates/forms/settings-account.html.twig b/app/sprinkles/account/templates/forms/settings-account.html.twig index 996b27b57..66393c783 100644 --- a/app/sprinkles/account/templates/forms/settings-account.html.twig +++ b/app/sprinkles/account/templates/forms/settings-account.html.twig @@ -1,6 +1,6 @@
    -

    {{translate("ACCOUNT.SETTINGS")}}

    +

    {{translate("ACCOUNT.SETTINGS")}}

    {% include "forms/csrf.html.twig" %} diff --git a/app/sprinkles/account/templates/forms/settings-profile.html.twig b/app/sprinkles/account/templates/forms/settings-profile.html.twig index 0b0a788ab..638469f5b 100644 --- a/app/sprinkles/account/templates/forms/settings-profile.html.twig +++ b/app/sprinkles/account/templates/forms/settings-profile.html.twig @@ -1,6 +1,6 @@
    -

    {{translate("PROFILE.SETTINGS")}}

    +

    {{translate("PROFILE.SETTINGS")}}

    {% include "forms/csrf.html.twig" %} diff --git a/app/sprinkles/account/templates/navigation/user-card.html.twig b/app/sprinkles/account/templates/navigation/user-card.html.twig index 47e18f1cd..ec8a2e46b 100644 --- a/app/sprinkles/account/templates/navigation/user-card.html.twig +++ b/app/sprinkles/account/templates/navigation/user-card.html.twig @@ -4,7 +4,7 @@ User Image - + {% endblock %}
      diff --git a/app/sprinkles/account/templates/pages/error/compromised.html.twig b/app/sprinkles/account/templates/pages/error/compromised.html.twig index 6048619cc..b4289cc37 100644 --- a/app/sprinkles/account/templates/pages/error/compromised.html.twig +++ b/app/sprinkles/account/templates/pages/error/compromised.html.twig @@ -5,7 +5,7 @@ {% block page_description %}{{ translate('ACCOUNT.SESSION_COMPROMISED.TITLE') }}{% endblock %} {% block heading %} - {{ translate('ACCOUNT.SESSION_COMPROMISED.TEXT', { + {{ translate('ACCOUNT.SESSION_COMPROMISED.TEXT', { 'url' : site.uri.public ~ '/account/sign-in' }) | raw }} {% endblock %} diff --git a/app/sprinkles/admin/src/Controller/GroupController.php b/app/sprinkles/admin/src/Controller/GroupController.php index 0e97b7df3..56bee3d23 100644 --- a/app/sprinkles/admin/src/Controller/GroupController.php +++ b/app/sprinkles/admin/src/Controller/GroupController.php @@ -383,7 +383,7 @@ public function getModalCreate(Request $request, Response $response, $args) // Create a dummy group to prepopulate fields $group = $classMapper->createInstance('group', []); - $group->icon = 'fa fa-user'; + $group->icon = 'fas fa-user'; $fieldNames = ['name', 'slug', 'icon', 'description']; $fields = [ diff --git a/app/sprinkles/admin/templates/forms/group.html.twig b/app/sprinkles/admin/templates/forms/group.html.twig index 36d663239..50c8da4a0 100644 --- a/app/sprinkles/admin/templates/forms/group.html.twig +++ b/app/sprinkles/admin/templates/forms/group.html.twig @@ -9,7 +9,7 @@
      - +
      @@ -20,7 +20,7 @@
      - + {% if 'slug' not in form.fields.disabled %} diff --git a/app/sprinkles/admin/templates/forms/role.html.twig b/app/sprinkles/admin/templates/forms/role.html.twig index 46a447704..5a8fc07fa 100644 --- a/app/sprinkles/admin/templates/forms/role.html.twig +++ b/app/sprinkles/admin/templates/forms/role.html.twig @@ -8,7 +8,7 @@
      - +
      @@ -19,7 +19,7 @@
      - + {% if 'slug' not in form.fields.disabled %} diff --git a/app/sprinkles/admin/templates/forms/user.html.twig b/app/sprinkles/admin/templates/forms/user.html.twig index 3ee7fc9d4..491a28f92 100644 --- a/app/sprinkles/admin/templates/forms/user.html.twig +++ b/app/sprinkles/admin/templates/forms/user.html.twig @@ -9,7 +9,7 @@
      - +
      @@ -20,7 +20,7 @@
      - + {% if 'group' in form.fields.disabled %} {% else %} @@ -39,7 +39,7 @@
      - +
      @@ -48,7 +48,7 @@
      - +
      @@ -59,11 +59,11 @@
      - + {% if 'email' in form.fields.disabled %} - + {% endif %}
      @@ -75,7 +75,7 @@
      - + {% if 'theme' in form.fields.disabled %} {% else %} @@ -94,7 +94,7 @@
      - + {% if 'locale' in form.fields.disabled %} {% else %} diff --git a/app/sprinkles/admin/templates/modals/role-manage-permissions.html.twig b/app/sprinkles/admin/templates/modals/role-manage-permissions.html.twig index 3914d2e61..5eb9c3067 100644 --- a/app/sprinkles/admin/templates/modals/role-manage-permissions.html.twig +++ b/app/sprinkles/admin/templates/modals/role-manage-permissions.html.twig @@ -81,7 +81,7 @@
      - + diff --git a/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig b/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig index b41c60b25..2b38263a0 100644 --- a/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig +++ b/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig @@ -64,7 +64,7 @@ {{description}} - + diff --git a/app/sprinkles/admin/templates/modals/user-set-password.html.twig b/app/sprinkles/admin/templates/modals/user-set-password.html.twig index 922d4e268..d067bcb03 100644 --- a/app/sprinkles/admin/templates/modals/user-set-password.html.twig +++ b/app/sprinkles/admin/templates/modals/user-set-password.html.twig @@ -31,14 +31,14 @@
      - +
      - +
      diff --git a/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig b/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig index a579ec4d6..f2c446ac4 100644 --- a/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig +++ b/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig @@ -1,12 +1,12 @@ {% block navigation %} {% if checkAccess('uri_dashboard') %}
    • - {{ translate("DASHBOARD") }} + {{ translate("DASHBOARD") }}
      • {% endif %} {% if checkAccess('uri_users') %}
    • - {{ translate("USER", 2) }} + {{ translate("USER", 2) }}
      • {% elseif checkAccess('uri_group', { 'group': current_user.group @@ -17,22 +17,22 @@ {% endif %} {% if checkAccess('uri_activities') %}
    • - {{ translate("ACTIVITY", 2) }} + {{ translate("ACTIVITY", 2) }}
      • {% endif %} {% if checkAccess('uri_roles') %}
    • - {{ translate("ROLE", 2) }} + {{ translate("ROLE", 2) }}
      • {% endif %} {% if checkAccess('uri_permissions') %}
    • - {{ translate("PERMISSION", 2) }} + {{ translate("PERMISSION", 2) }}
      • {% endif %} {% if checkAccess('uri_groups') %}
    • - {{ translate("GROUP", 2) }} + {{ translate("GROUP", 2) }}
      • {% endif %} {% endblock %} diff --git a/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig b/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig index 3188a348a..75ef6f7d8 100644 --- a/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig +++ b/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig @@ -30,7 +30,7 @@ {% block navbar_logo %} {% endblock %} diff --git a/app/sprinkles/admin/templates/pages/activities.html.twig b/app/sprinkles/admin/templates/pages/activities.html.twig index bcbd9c6c0..bbf1334ac 100644 --- a/app/sprinkles/admin/templates/pages/activities.html.twig +++ b/app/sprinkles/admin/templates/pages/activities.html.twig @@ -15,7 +15,7 @@
      -

      {{translate('ACTIVITY', 2)}}

      +

      {{translate('ACTIVITY', 2)}}

      {% include "tables/table-tool-menu.html.twig" %}
      diff --git a/app/sprinkles/admin/templates/pages/dashboard.html.twig b/app/sprinkles/admin/templates/pages/dashboard.html.twig index 630b23e25..37c9c6d2f 100644 --- a/app/sprinkles/admin/templates/pages/dashboard.html.twig +++ b/app/sprinkles/admin/templates/pages/dashboard.html.twig @@ -11,7 +11,7 @@
      - +
      {{ translate("USER", 2) }} {{counter.users}} @@ -26,7 +26,7 @@
      - +
      {{ translate("ROLE", 2) }} {{counter.roles}} @@ -41,7 +41,7 @@
      - +
      {{ translate("GROUP", 2) }} {{counter.groups}} @@ -72,7 +72,7 @@
      - +
      {{ translate("USER", 2) }} {{current_user.group.users.count}} @@ -187,7 +187,7 @@
      -

      {{translate('ACTIVITY', 2)}}

      +

      {{translate('ACTIVITY', 2)}}

      {% include "tables/table-tool-menu.html.twig" %}
      @@ -208,7 +208,7 @@
      -

      {{translate('USER', 2)}}

      +

      {{translate('USER', 2)}}

      {% include "tables/table-tool-menu.html.twig" %}
      @@ -221,7 +221,7 @@
      @@ -279,4 +279,4 @@ {{ assets.js('js/pages/dashboard') | raw }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/sprinkles/admin/templates/pages/group.html.twig b/app/sprinkles/admin/templates/pages/group.html.twig index 35bf233f0..f51b7757e 100644 --- a/app/sprinkles/admin/templates/pages/group.html.twig +++ b/app/sprinkles/admin/templates/pages/group.html.twig @@ -20,19 +20,19 @@
        {% block tools %}
      • - {{translate('EDIT')}} + {{translate('EDIT')}}
        • {% if 'delete' not in tools.hidden %}
      • - {{translate('DELETE')}} + {{translate('DELETE')}}
        • {% endif %} @@ -56,7 +56,7 @@ {% endif %} {% if 'users' not in fields.hidden %}
        - {{ translate('USER', 2)}} + {{ translate('USER', 2)}}

        {{group.users.count}}

        @@ -68,7 +68,7 @@
        -

        {{translate('USER', 2)}}

        +

        {{translate('USER', 2)}}

        {% include "tables/table-tool-menu.html.twig" %}
        diff --git a/app/sprinkles/admin/templates/pages/groups.html.twig b/app/sprinkles/admin/templates/pages/groups.html.twig index 35e9a88c2..b07e148ee 100644 --- a/app/sprinkles/admin/templates/pages/groups.html.twig +++ b/app/sprinkles/admin/templates/pages/groups.html.twig @@ -15,7 +15,7 @@
        -

        {{translate('GROUP', 2)}}

        +

        {{translate('GROUP', 2)}}

        {% include "tables/table-tool-menu.html.twig" %}
        @@ -29,7 +29,7 @@ {% if checkAccess('create_group') %}
        {% endif %} diff --git a/app/sprinkles/admin/templates/pages/permission.html.twig b/app/sprinkles/admin/templates/pages/permission.html.twig index 6adc01473..0d3895402 100644 --- a/app/sprinkles/admin/templates/pages/permission.html.twig +++ b/app/sprinkles/admin/templates/pages/permission.html.twig @@ -19,7 +19,7 @@
        - +

        {{permission.name}}

        @@ -31,7 +31,7 @@ {{translate("PERMISSION.ID")}}: {{permission.id}} - +
        {{translate("SLUG_CONDITION")}} @@ -52,7 +52,7 @@
        -

        {{translate("USER.WITH_PERMISSION")}}

        +

        {{translate("USER.WITH_PERMISSION")}}

        {% include "tables/table-tool-menu.html.twig" %}
        diff --git a/app/sprinkles/admin/templates/pages/permissions.html.twig b/app/sprinkles/admin/templates/pages/permissions.html.twig index 26962092a..9becc52ad 100644 --- a/app/sprinkles/admin/templates/pages/permissions.html.twig +++ b/app/sprinkles/admin/templates/pages/permissions.html.twig @@ -15,7 +15,7 @@
        -

        {{translate('PERMISSION', 2)}}

        +

        {{translate('PERMISSION', 2)}}

        {% include "tables/table-tool-menu.html.twig" %}
        diff --git a/app/sprinkles/admin/templates/pages/role.html.twig b/app/sprinkles/admin/templates/pages/role.html.twig index aa79cf5b6..4314136ab 100644 --- a/app/sprinkles/admin/templates/pages/role.html.twig +++ b/app/sprinkles/admin/templates/pages/role.html.twig @@ -20,26 +20,26 @@
        - +

        {{role.name}}

        @@ -63,7 +63,7 @@ {% endif %} {% if 'users' not in fields.hidden %}
        - {{ translate('USER', 2)}} + {{ translate('USER', 2)}}

        {{role.users.count}}

        @@ -74,7 +74,7 @@
        -

        {{translate('PERMISSION', 2)}}

        +

        {{translate('PERMISSION', 2)}}

        {% include "tables/table-tool-menu.html.twig" %}
        @@ -90,7 +90,7 @@
        -

        {{translate('USER', 2)}}

        +

        {{translate('USER', 2)}}

        {% include "tables/table-tool-menu.html.twig" %}
        diff --git a/app/sprinkles/admin/templates/pages/roles.html.twig b/app/sprinkles/admin/templates/pages/roles.html.twig index c8ff090c0..9abe8fda1 100644 --- a/app/sprinkles/admin/templates/pages/roles.html.twig +++ b/app/sprinkles/admin/templates/pages/roles.html.twig @@ -15,7 +15,7 @@
        -

        {{translate('ROLE', 2)}}

        +

        {{translate('ROLE', 2)}}

        {% include "tables/table-tool-menu.html.twig" %}
        @@ -28,7 +28,7 @@
        diff --git a/app/sprinkles/admin/templates/pages/user.html.twig b/app/sprinkles/admin/templates/pages/user.html.twig index de6bcbf6f..124b4fb93 100644 --- a/app/sprinkles/admin/templates/pages/user.html.twig +++ b/app/sprinkles/admin/templates/pages/user.html.twig @@ -24,33 +24,33 @@
          {% block tools %}
        • - {{translate('EDIT')}} + {{translate('EDIT')}}
          • {% if 'password' not in tools.hidden %}
        • - {{translate('PASSWORD')}} + {{translate('PASSWORD')}}
          • {% endif %} {% if 'roles' not in tools.hidden %}
        • - {{translate('ROLE', 2)}} + {{translate('ROLE', 2)}}
          • {% endif %} {% if 'activate' not in tools.hidden and user.flag_verified == "0" %}
        • - {{translate('ACTIVATE')}} + {{translate('ACTIVATE')}}
          • {% endif %} @@ -58,13 +58,13 @@ {% if user.flag_enabled == "1" %}
        • - {{translate('DISABLE')}} + {{translate('DISABLE')}}
          • {% else %}
        • - {{translate('ENABLE')}} + {{translate('ENABLE')}}
          • {% endif %} @@ -72,7 +72,7 @@ {% if 'delete' not in tools.hidden %}
        • - {{translate('DELETE')}} + {{translate('DELETE')}}
          • {% endif %} @@ -88,26 +88,26 @@

          {{user.full_name}}

          {% if user.flag_enabled == 0 %} - + {% endif %} {% if user.flag_verified == 0 %} - + {% endif %}

          {{user.user_name}}{% if 'group' not in fields.hidden %} • {{user.group.name}}{% endif %}

          {% if 'email' not in fields.hidden %}
          - {{translate("EMAIL")}} + {{translate("EMAIL")}}

          - + {{user.email}}

          {% endif %} {% if 'locale' not in fields.hidden %}
          - {{translate("LOCALE")}} + {{translate("LOCALE")}}

          {{locales[user.locale]}}

          @@ -117,7 +117,7 @@ {% if 'roles' not in fields.hidden %}
          - {{translate("ROLE", 2)}} + {{translate("ROLE", 2)}}

          {% for role in user.roles %} {{role.name}} @@ -134,7 +134,7 @@ {% block activity_box %}

          -

          {{translate('ACTIVITY', 2)}}

          +

          {{translate('ACTIVITY', 2)}}

          {% include "tables/table-tool-menu.html.twig" %}
          @@ -155,7 +155,7 @@
          -

          {{translate('PERMISSION', 2)}}

          +

          {{translate('PERMISSION', 2)}}

          {% include "tables/table-tool-menu.html.twig" %}
          diff --git a/app/sprinkles/admin/templates/pages/users.html.twig b/app/sprinkles/admin/templates/pages/users.html.twig index 3e4642dc9..47bcd5a0d 100644 --- a/app/sprinkles/admin/templates/pages/users.html.twig +++ b/app/sprinkles/admin/templates/pages/users.html.twig @@ -15,7 +15,7 @@
          -

          {{translate('USER', 2)}}

          +

          {{translate('USER', 2)}}

          {% include "tables/table-tool-menu.html.twig" %}
          @@ -30,7 +30,7 @@ {% if checkAccess('create_user') %}
          {% endif %} diff --git a/app/sprinkles/admin/templates/tables/activities.html.twig b/app/sprinkles/admin/templates/tables/activities.html.twig index d70541bbf..971d76267 100644 --- a/app/sprinkles/admin/templates/tables/activities.html.twig +++ b/app/sprinkles/admin/templates/tables/activities.html.twig @@ -11,11 +11,11 @@ - + {% if 'user' in table.columns %} - + {% endif %} - + @@ -51,7 +51,7 @@
          {{row.user.email}} - +
          {{ else }} {% endverbatim %}{{translate("USER.DELETED")}}{% verbatim %} diff --git a/app/sprinkles/admin/templates/tables/groups.html.twig b/app/sprinkles/admin/templates/tables/groups.html.twig index 2c5a84a10..ee1d30da6 100644 --- a/app/sprinkles/admin/templates/tables/groups.html.twig +++ b/app/sprinkles/admin/templates/tables/groups.html.twig @@ -11,8 +11,8 @@
          {{translate('ACTIVITY.TIME')}} {{translate('ACTIVITY.TIME')}} {{translate('USER')}} {{translate('USER')}} {{translate("DESCRIPTION")}} {{translate("DESCRIPTION")}}
          - - + + @@ -53,12 +53,12 @@ diff --git a/app/sprinkles/admin/templates/tables/permissions.html.twig b/app/sprinkles/admin/templates/tables/permissions.html.twig index 92e236ac5..4edbee696 100644 --- a/app/sprinkles/admin/templates/tables/permissions.html.twig +++ b/app/sprinkles/admin/templates/tables/permissions.html.twig @@ -11,8 +11,8 @@
          {{translate('GROUP')}} {{translate("DESCRIPTION")}} {{translate('GROUP')}} {{translate("DESCRIPTION")}} {{translate("ACTIONS")}}
          - - + + {% if 'via_roles' in table.columns %} {% endif %} diff --git a/app/sprinkles/admin/templates/tables/roles.html.twig b/app/sprinkles/admin/templates/tables/roles.html.twig index dbdb49e03..9b3f14954 100644 --- a/app/sprinkles/admin/templates/tables/roles.html.twig +++ b/app/sprinkles/admin/templates/tables/roles.html.twig @@ -11,8 +11,8 @@
          {{translate('PERMISSION')}} {{translate('SLUG_CONDITION')}} {{translate('PERMISSION')}} {{translate('SLUG_CONDITION')}} {{translate('PERMISSION.VIA_ROLES')}}
          - - + + @@ -53,17 +53,17 @@ diff --git a/app/sprinkles/admin/templates/tables/users.html.twig b/app/sprinkles/admin/templates/tables/users.html.twig index cf1ae228a..2fe54f492 100644 --- a/app/sprinkles/admin/templates/tables/users.html.twig +++ b/app/sprinkles/admin/templates/tables/users.html.twig @@ -11,14 +11,14 @@
          {{translate('ROLE')}} {{translate('DESCRIPTION')}} {{translate('ROLE')}} {{translate('DESCRIPTION')}} {{translate('ACTIONS')}}
          - + {% if 'last_activity' in table.columns %} - + {% endif %} {% if 'via_roles' in table.columns %} {% endif %} - + @@ -42,7 +42,7 @@
          {{row.email}} - +
          @@ -98,39 +98,39 @@ {{#ifx row.flag_verified '==' 0 }}
        • - {% endverbatim %}{{translate("USER.ACTIVATE")}}{% verbatim %} + {% endverbatim %}{{translate("USER.ACTIVATE")}}{% verbatim %}
          • {{/ifx }}
        • - {% endverbatim %}{{translate("USER.EDIT")}}{% verbatim %} + {% endverbatim %}{{translate("USER.EDIT")}}{% verbatim %}
        • - {% endverbatim %}{{translate("ROLE.MANAGE")}}{% verbatim %} + {% endverbatim %}{{translate("ROLE.MANAGE")}}{% verbatim %}
        • - {% endverbatim %}{{translate("USER.ADMIN.CHANGE_PASSWORD")}}{% verbatim %} + {% endverbatim %}{{translate("USER.ADMIN.CHANGE_PASSWORD")}}{% verbatim %}
        • {{#ifx row.flag_enabled '==' 1 }} - {% endverbatim %}{{translate("USER.DISABLE")}}{% verbatim %} + {% endverbatim %}{{translate("USER.DISABLE")}}{% verbatim %} {{ else }} - {% endverbatim %}{{translate("USER.ENABLE")}}{% verbatim %} + {% endverbatim %}{{translate("USER.ENABLE")}}{% verbatim %} {{/ifx }}
        • - {% endverbatim %}{{translate("USER.DELETE")}}{% verbatim %} + {% endverbatim %}{{translate("USER.DELETE")}}{% verbatim %}
          • diff --git a/app/sprinkles/core/assets/userfrosting/css/AdminLTE.css b/app/sprinkles/core/assets/userfrosting/css/AdminLTE.css index 9aef04a34..b94f0658d 100644 --- a/app/sprinkles/core/assets/userfrosting/css/AdminLTE.css +++ b/app/sprinkles/core/assets/userfrosting/css/AdminLTE.css @@ -1316,17 +1316,17 @@ a:focus { padding-left: 0; } /* support Font Awesome icons in form-control */ -.form-control-feedback.fa { +.form-control-feedback.fas { line-height: 34px; } .input-lg + .form-control-feedback.fa, .input-group-lg + .form-control-feedback.fa, -.form-group-lg .form-control + .form-control-feedback.fa { +.form-group-lg .form-control + .form-control-feedback.fas { line-height: 46px; } .input-sm + .form-control-feedback.fa, .input-group-sm + .form-control-feedback.fa, -.form-group-sm .form-control + .form-control-feedback.fa { +.form-group-sm .form-control + .form-control-feedback.fas { line-height: 30px; } /* @@ -1706,7 +1706,7 @@ a:focus { border-radius: 3px; } .box .overlay > .fa, -.overlay-wrapper .overlay > .fa { +.overlay-wrapper .overlay > .fas { position: absolute; top: 50%; left: 50%; @@ -2961,7 +2961,7 @@ table.text-center th { .carousel-control.right { background-image: none; } -.carousel-control > .fa { +.carousel-control > .fas { font-size: 40px; position: absolute; top: 50%; @@ -4169,7 +4169,7 @@ table.text-center th { margin-right: 5px; line-height: 30px; } -.fc-color-picker > li .fa { +.fc-color-picker > li .fas { -webkit-transition: -webkit-transform linear 0.3s; -moz-transition: -moz-transform linear 0.3s; -o-transition: -o-transform linear 0.3s; diff --git a/app/sprinkles/core/assets/userfrosting/css/userfrosting.css b/app/sprinkles/core/assets/userfrosting/css/userfrosting.css index 149688196..3dd0b93f2 100644 --- a/app/sprinkles/core/assets/userfrosting/css/userfrosting.css +++ b/app/sprinkles/core/assets/userfrosting/css/userfrosting.css @@ -175,7 +175,7 @@ a .info-box { } /* Padding for user menu */ -.user-menu .fa { +.user-menu .fas { padding-left: .5em; font-size: 11px; } diff --git a/app/sprinkles/core/assets/userfrosting/js/AdminLTE.js b/app/sprinkles/core/assets/userfrosting/js/AdminLTE.js index 54b605528..d7297a0e1 100644 --- a/app/sprinkles/core/assets/userfrosting/js/AdminLTE.js +++ b/app/sprinkles/core/assets/userfrosting/js/AdminLTE.js @@ -631,7 +631,7 @@ function _init() { }, options); //The overlay - var overlay = $('
          '); + var overlay = $('
          '); return this.each(function () { //if a source is specified diff --git a/app/sprinkles/core/assets/userfrosting/js/uf-form.js b/app/sprinkles/core/assets/userfrosting/js/uf-form.js index f9ca51371..d77b02b37 100644 --- a/app/sprinkles/core/assets/userfrosting/js/uf-form.js +++ b/app/sprinkles/core/assets/userfrosting/js/uf-form.js @@ -40,7 +40,7 @@ defaults = { DEBUG: false, site: site, // global site variables - submittingText: "", + submittingText: "", beforeSubmitCallback: null, binaryCheckboxes: true, // submit checked/unchecked checkboxes as 0/1 values keyupDelay: 0, diff --git a/app/sprinkles/core/assets/userfrosting/js/uf-jqueryvalidation-config.js b/app/sprinkles/core/assets/userfrosting/js/uf-jqueryvalidation-config.js index 3969ad613..d29c87fa4 100644 --- a/app/sprinkles/core/assets/userfrosting/js/uf-jqueryvalidation-config.js +++ b/app/sprinkles/core/assets/userfrosting/js/uf-jqueryvalidation-config.js @@ -44,6 +44,6 @@ jQuery.validator.setDefaults({ // Hide any non-feedback icons formGroup.find('.form-control-icon').hide(); // Add a new check mark - jQuery(element).after(''); + jQuery(element).after(''); } }); diff --git a/app/sprinkles/core/assets/userfrosting/js/uf-table.js b/app/sprinkles/core/assets/userfrosting/js/uf-table.js index 06a186692..b442acc62 100644 --- a/app/sprinkles/core/assets/userfrosting/js/uf-table.js +++ b/app/sprinkles/core/assets/userfrosting/js/uf-table.js @@ -16,8 +16,8 @@
          {{translate('USER')}} {{translate('USER')}} {{translate("ACTIVITY.LAST")}} {{translate("ACTIVITY.LAST")}} {{translate('PERMISSION.VIA_ROLES')}}{{translate("STATUS")}} {{translate("STATUS")}} {{translate("ACTIONS")}}
          - - + + @@ -30,7 +30,7 @@ {{row.first_name}} {{row.last_name}} ({{row.user_name}}) @@ -50,11 +50,11 @@
          - - + + - - + +

          Jump to Page: • Show: - +
          {% endblock %}
          @@ -35,11 +35,11 @@ {% block table_pager_controls %}
          - - + + {# this can be any element, including an input #} - - + +

          {{translate("PAGINATION.GOTO")}}: • {{translate("PAGINATION.SHOW")}}: +
          diff --git a/app/sprinkles/account/templates/forms/settings-profile.html.twig b/app/sprinkles/account/templates/forms/settings-profile.html.twig index 638469f5b..7123144b8 100644 --- a/app/sprinkles/account/templates/forms/settings-profile.html.twig +++ b/app/sprinkles/account/templates/forms/settings-profile.html.twig @@ -20,6 +20,7 @@
          + {% if 'locale' not in fields.hidden %}

          {{translate("LOCALE.ACCOUNT")}}.

          + {% endif %} {% endblock %}
          diff --git a/app/sprinkles/account/templates/pages/register.html.twig b/app/sprinkles/account/templates/pages/register.html.twig index c181a870f..06168643b 100644 --- a/app/sprinkles/account/templates/pages/register.html.twig +++ b/app/sprinkles/account/templates/pages/register.html.twig @@ -1,116 +1,118 @@ -{% extends "pages/abstract/base.html.twig" %} - -{# Overrides blocks in head of base template #} -{% block page_title %}{{translate('REGISTER')}}{% endblock %} - -{% block page_description %}{{translate('PAGE.LOGIN.DESCRIPTION', {'site_name': site.title })}}{% endblock %} - -{% block body_attributes %} - class="hold-transition login-page" -{% endblock %} - -{% block content %} - - -{% endblock %} - -{% block scripts_page %} - - - - - {{ assets.js('js/pages/register') | raw }} -{% endblock %} +{% extends "pages/abstract/base.html.twig" %} + +{# Overrides blocks in head of base template #} +{% block page_title %}{{translate('REGISTER')}}{% endblock %} + +{% block page_description %}{{translate('PAGE.LOGIN.DESCRIPTION', {'site_name': site.title })}}{% endblock %} + +{% block body_attributes %} + class="hold-transition login-page" +{% endblock %} + +{% block content %} + + +{% endblock %} + +{% block scripts_page %} + + + + + {{ assets.js('js/pages/register') | raw }} +{% endblock %} diff --git a/app/sprinkles/account/templates/pages/reset-password.html.twig b/app/sprinkles/account/templates/pages/reset-password.html.twig index 8e3a24adc..3f555a40f 100644 --- a/app/sprinkles/account/templates/pages/reset-password.html.twig +++ b/app/sprinkles/account/templates/pages/reset-password.html.twig @@ -30,7 +30,7 @@
          - +
          diff --git a/app/sprinkles/account/templates/pages/set-password.html.twig b/app/sprinkles/account/templates/pages/set-password.html.twig index 3c4fe2bab..d6af1d251 100644 --- a/app/sprinkles/account/templates/pages/set-password.html.twig +++ b/app/sprinkles/account/templates/pages/set-password.html.twig @@ -30,7 +30,7 @@
          - +
          diff --git a/app/sprinkles/account/tests/Integration/AuthenticatorTest.php b/app/sprinkles/account/tests/Integration/AuthenticatorTest.php index 38ddde710..7fcb5d5c4 100644 --- a/app/sprinkles/account/tests/Integration/AuthenticatorTest.php +++ b/app/sprinkles/account/tests/Integration/AuthenticatorTest.php @@ -1,5 +1,6 @@ assertNotSame($testUser->id, $this->ci->session[$key]); } + /** + * @depends testConstructor + * @param Authenticator $authenticator + */ + public function testLoginWithSessionDatabase(Authenticator $authenticator) + { + // Reset CI Session + $this->useDatabaseSessionHandler(); + + // Create a test user + $testUser = $this->createTestUser(); + + // Check the table + $this->assertSame(0, SessionTable::count()); + + // Test session to avoid false positive + $key = $this->ci->config['session.keys.current_user_id']; + $this->assertNull($this->ci->session[$key]); + $this->assertNotSame($testUser->id, $this->ci->session[$key]); + + // Login the test user + $authenticator->login($testUser, false); + + // Test session to see if user was logged in + $this->assertNotNull($this->ci->session[$key]); + $this->assertSame($testUser->id, $this->ci->session[$key]); + + // Close session to initiate write + session_write_close(); + + // Check the table again + $this->assertSame(1, SessionTable::count()); + + // Reopen session + $this->ci->session->start(); + + // Must logout to avoid test issue + $authenticator->logout(true); + + // We'll test the logout system works too while we're at it (and depend on it) + $key = $this->ci->config['session.keys.current_user_id']; + $this->assertNull($this->ci->session[$key]); + $this->assertNotSame($testUser->id, $this->ci->session[$key]); + + // Make sure table entry has been removed + $this->assertSame(0, SessionTable::count()); + } + /** * @depends testConstructor * @expectedException \UserFrosting\Sprinkle\Account\Authenticate\Exception\AccountInvalidException @@ -118,7 +170,9 @@ public function testValidateUserAccount(Authenticator $authenticator) { $testUser = $this->createTestUser(); $user = $this->invokeMethod($authenticator, 'validateUserAccount', [$testUser->id]); - $this->assertSame($testUser->id, $user->id); + $testUserId = $testUser->id; + $userId = $user->id; + $this->assertSame($testUserId, $userId); } /** @@ -254,7 +308,7 @@ public function testAttempt_withFlagEnabledFalse(Authenticator $authenticator) $password = 'FooBar'; $testUser = $this->createTestUser(false, false, [ 'password' => Password::hash($password), - 'flag_enabled' => 0 + 'flag_enabled' => 0, ]); $currentUser = $authenticator->attempt('user_name', $testUser->user_name, $password, false); @@ -271,7 +325,7 @@ public function testAttempt_withFlagVerifiedFalse(Authenticator $authenticator) $password = 'FooBar'; $testUser = $this->createTestUser(false, false, [ 'password' => Password::hash($password), - 'flag_verified' => 0 + 'flag_verified' => 0, ]); $currentUser = $authenticator->attempt('user_name', $testUser->user_name, $password, false); @@ -293,7 +347,7 @@ public function testAttempt_withFlagVerifiedFalseNoEmailVerification(Authenticat $password = 'FooBar'; $testUser = $this->createTestUser(false, false, [ 'password' => Password::hash($password), - 'flag_verified' => 0 + 'flag_verified' => 0, ]); $currentUser = $authenticator->attempt('user_name', $testUser->user_name, $password, false); @@ -314,7 +368,7 @@ public function testAttempt_withBadPassword(Authenticator $authenticator) { $password = 'FooBar'; $testUser = $this->createTestUser(false, false, [ - 'password' => Password::hash($password) + 'password' => Password::hash($password), ]); $currentUser = $authenticator->attempt('user_name', $testUser->user_name, 'BarFoo', false); diff --git a/app/sprinkles/account/tests/Integration/AuthorizationManagerTest.php b/app/sprinkles/account/tests/Integration/AuthorizationManagerTest.php index 01ae32d4c..5f2d930c6 100644 --- a/app/sprinkles/account/tests/Integration/AuthorizationManagerTest.php +++ b/app/sprinkles/account/tests/Integration/AuthorizationManagerTest.php @@ -1,5 +1,6 @@ setupTestDatabase(); + + if ($this->usingInMemoryDatabase() || !static::$initialized) { + + // Setup database, then setup User & default role + $this->refreshDatabase(); + static::$initialized = true; + } + } + + public function tearDown() + { + parent::tearDown(); + m::close(); + } + + /** + * @return AccountController + */ + public function testControllerConstructor() + { + $controller = $this->getController(); + $this->assertInstanceOf(AccountController::class, $controller); + + return $controller; + } + + /** + * N.B.: Must be first test, before any master user is created + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testRegisterWithNoMasterUser(AccountController $controller) + { + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'spiderbro' => 'http://', + ]); + + $result = $controller->register($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 403); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * N.B.: Run this register second, as it's easier if no test user is present. + * @depends testControllerConstructor + * @see UserFrosting\Sprinkle\Account\Tests\Integration\RegistrationTest for complete registration exception (for example duplicate email) testing + */ + public function testRegister() + { + // Force locale config + $this->ci->config['site.registration.user_defaults.locale'] = 'en_US'; + $this->ci->config['site.locales.available'] = [ + 'en_US' => 'English', + ]; + + // Create fake mailer + $mailer = m::mock(Mailer::class); + $mailer->shouldReceive('send')->once()->with(\Mockery::type(TwigMailMessage::class)); + $this->ci->mailer = $mailer; + + // Register will fail on PGSQL if a user is created with forced id + // before registration occurs because the forced id mess the auto_increment + // @see https://stackoverflow.com/questions/36157029/laravel-5-2-eloquent-save-auto-increment-pgsql-exception-on-same-id + // So we create a dummy user and assign the master id config to it's id + // to bypass the "no registration if no master user" security feature. + // (Note the dummy should by default be id n°1, but we still assign the config + // in case the default config does not return 1) + $fm = $this->ci->factory; + $dummyUser = $fm->create(User::class); + $this->ci->config['reserved_user_ids.master'] = $dummyUser->id; + + // Recreate controller to use fake config + $controller = $this->getController(); + + // Perfrom common test code + $this->performActualRegisterTest($controller); + } + + /** + * @depends testControllerConstructor + * @depends testRegister + */ + public function testRegisterWithNoEmailVerification() + { + // Delete previous attempt so we can reuse the same shared test code + if ($user = User::where('email', 'testRegister@test.com')->first()) { + $user->delete(true); + } + + // Force locale config, disable email verification + $this->ci->config['site.registration.require_email_verification'] = false; + $this->ci->config['site.registration.user_defaults.locale'] = 'en_US'; + $this->ci->config['site.locales.available'] = [ + 'en_US' => 'English', + ]; + + // Bypass security feature + $fm = $this->ci->factory; + $dummyUser = $fm->create(User::class); + $this->ci->config['reserved_user_ids.master'] = $dummyUser->id; + + // Recreate controller to use fake config + $controller = $this->getController(); + + // Perfrom common test code + $this->performActualRegisterTest($controller); + } + + /** + * @param AccountController $controller + */ + protected function performActualRegisterTest(AccountController $controller) + { + // Genereate a captcha for next request. + $captcha = new Captcha($this->ci->session, $this->ci->config['session.keys.captcha']); + $captcha->generateRandomCode(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'spiderbro' => 'http://', + 'captcha' => $captcha->getCaptcha(), + 'user_name' => 'RegisteredUser', + 'first_name' => 'Testing', + 'last_name' => 'Register', + 'email' => 'testRegister@test.com', + 'password' => 'FooBarFooBar123', + 'passwordc' => 'FooBarFooBar123', + 'locale' => '', + ]); + + $result = $controller->register($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure the user is added to the db by querying it + $users = User::where('email', 'testRegister@test.com')->get(); + $this->assertCount(1, $users); + $this->assertSame('RegisteredUser', $users->first()['user_name']); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testcheckUsername(AccountController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'potato', + ]); + + $result = $controller->checkUsername($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertSame('true', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + * @depends testcheckUsername + * @param AccountController $controller + */ + public function testcheckUsernameWithNoData(AccountController $controller) + { + $this->expectException(BadRequestException::class); + $controller->checkUsername($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructor + * @depends testcheckUsername + * @param AccountController $controller + */ + public function testcheckUsernameWithUsernameNotAvailable(AccountController $controller) + { + // Create test user + $this->createTestUser(false, false, [ + 'user_name' => 'userfoo', + ]); + + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'userfoo', + ]); + + $result = $controller->checkUsername($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + $this->assertNotSame('true', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + * @depends testcheckUsername + */ + public function testcheckUsernameWithThrottler() + { + // Create fake throttler + $throttler = m::mock(Throttler::class); + $throttler->shouldReceive('getDelay')->once()->with('check_username_request')->andReturn(90); + $this->ci->throttler = $throttler; + + // Recreate controller to use fake throttler + $controller = $this->getController(); + + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'potato', + ]); + + $result = $controller->checkUsername($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 429); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + */ + public function testdenyResetPassword() + { + // Create fake PasswordResetRepository + $repoPasswordReset = m::mock(PasswordResetRepository::class); + $repoPasswordReset->shouldReceive('cancel')->once()->with('potato')->andReturn(true); + $this->ci->repoPasswordReset = $repoPasswordReset; + + // Recreate controller to use fake PasswordResetRepository + $controller = $this->getController(); + + $request = $this->getRequest()->withQueryParams([ + 'token' => 'potato', + ]); + + $result = $controller->denyResetPassword($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 302); + $this->assertEquals($this->ci->router->pathFor('login'), $result->getHeaderLine('Location')); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testdenyResetPassword + */ + public function testdenyResetPasswordWithFailedPasswordReset() + { + // Create fake repoPasswordReset + $repoPasswordReset = m::mock(PasswordResetRepository::class); + $repoPasswordReset->shouldReceive('cancel')->once()->with('potato')->andReturn(false); + $this->ci->repoPasswordReset = $repoPasswordReset; + + // Recreate controller to use fake throttler + $controller = $this->getController(); + + $request = $this->getRequest()->withQueryParams([ + 'token' => 'potato', + ]); + + $result = $controller->denyResetPassword($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 302); + $this->assertEquals($this->ci->router->pathFor('login'), $result->getHeaderLine('Location')); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testdenyResetPassword + * @param AccountController $controller + */ + public function testdenyResetPasswordWithFailedValidation(AccountController $controller) + { + $result = $controller->denyResetPassword($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 302); + $this->assertEquals($this->ci->router->pathFor('login'), $result->getHeaderLine('Location')); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * N.B.: This test is incomplete as it doesn't actually check if + * repoPasswordReset returns the correct info and the message contains + * the right content + * @depends testControllerConstructor + */ + public function testforgotPassword() + { + // Create fake mailer + $mailer = m::mock(Mailer::class); + $mailer->shouldReceive('send')->once()->with(\Mockery::type(TwigMailMessage::class)); + $this->ci->mailer = $mailer; + + // Create fake user to test + $user = $this->createTestUser(false, false, [ + 'email' => 'foo@bar.com', + ]); + + // Recreate controller to use fake mailer + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'email' => 'foo@bar.com', + ]); + + $result = $controller->forgotPassword($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testforgotPassword + * @param AccountController $controller + */ + public function testforgotPasswordWithFailedValidation(AccountController $controller) + { + $request = $this->getRequest()->withParsedBody([]); + + $result = $controller->forgotPassword($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testforgotPassword + */ + public function testforgotPasswordWithThrottler() + { + // Create fake throttler + $throttler = m::mock(Throttler::class); + $throttler->shouldReceive('getDelay')->once()->with('password_reset_request', ['email' => 'foo@bar.com'])->andReturn(90); + $this->ci->throttler = $throttler; + + // Recreate controller to use fake throttler + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'email' => 'foo@bar.com', + ]); + + $result = $controller->forgotPassword($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 429); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testgetModalAccountTos(AccountController $controller) + { + $result = $controller->getModalAccountTos($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testimageCaptcha(AccountController $controller) + { + $result = $controller->imageCaptcha($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testlogin(AccountController $controller) + { + // Create a test user + $testUser = $this->createTestUser(); + + // Faker doesn't hash the password. Let's do that now + $unhashed = $testUser->password; + $testUser->password = Password::hash($testUser->password); + $testUser->save(); + + // Recreate controller to use test user + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'user_name' => $testUser->user_name, + 'password' => $unhashed, + 'rememberme' => false, + ]); + + $result = $controller->login($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + // Can't assert the status code or data, as this can be overwrited by sprinkles + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testlogin + * @param AccountController $controller + */ + public function testloginWithEmail(AccountController $controller) + { + // Create a test user + $testUser = $this->createTestUser(); + + // Faker doesn't hash the password. Let's do that now + $unhashed = $testUser->password; + $testUser->password = Password::hash($testUser->password); + $testUser->save(); + + // Recreate controller to use test user + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'user_name' => $testUser->email, + 'password' => $unhashed, + 'rememberme' => false, + ]); + + $result = $controller->login($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + // Can't assert the status code or data, as this can be overwrited by sprinkles + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testloginWithLoggedInUser(AccountController $controller) + { + // Create a test user + $testUser = $this->createTestUser(false, true); + + // Recreate controller to use fake throttler + $controller = $this->getController(); + + $result = $controller->login($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('warning', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testloginWithFailledValidation(AccountController $controller) + { + // Set POST + $request = $this->getRequest()->withParsedBody([]); + + $result = $controller->login($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + */ + public function testloginWithThrottler() + { + // Create fake throttler + $throttler = m::mock(Throttler::class); + $throttler->shouldReceive('getDelay')->once()->with('sign_in_attempt', ['user_identifier' => 'foo'])->andReturn(90); + $this->ci->throttler = $throttler; + + // Recreate controller to use fake throttler + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'user_name' => 'foo', + 'password' => 'bar', + 'rememberme' => false, + ]); + + $result = $controller->login($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 429); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + */ + public function testloginWithDisableEmail() + { + // Force config + $this->ci->config['site.login.enable_email'] = false; + + // Recreate controller to use new config + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'user_name' => 'foo@bar.com', + 'password' => 'bar', + ]); + + $result = $controller->login($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 403); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + */ + public function testlogoutWithLoggedInUser() + { + // Create a test user + $testUser = $this->createTestUser(false, true); + + // Recreate controller to use fake throttler + $controller = $this->getController(); + + $result = $controller->logout($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 302); + $this->assertEquals($this->ci->config['site.uri.public'], $result->getHeaderLine('Location')); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testlogoutWithNoUser(AccountController $controller) + { + $result = $controller->logout($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 302); + $this->assertEquals($this->ci->config['site.uri.public'], $result->getHeaderLine('Location')); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testpageForgotPassword(AccountController $controller) + { + $result = $controller->pageForgotPassword($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testpageRegister(AccountController $controller) + { + $result = $controller->pageRegister($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + * @depends testpageRegister + */ + public function testpageRegisterWithDisabledRegistration() + { + // Force config + $this->ci->config['site.registration.enabled'] = false; + + // Recreate controller to use new config + $controller = $this->getController(); + + $this->expectException(NotFoundException::class); + $controller->pageRegister($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructor + * @depends testpageRegister + */ + public function testpageRegisterWithNoLocales() + { + // Force config + $this->ci->config['site.locales.available'] = []; + + // Recreate controller to use new config + $controller = $this->getController(); + + $result = $controller->pageRegister($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + * @depends testpageRegister + */ + public function testpageRegisterWithLoggedInUser() + { + // Create a test user + $testUser = $this->createTestUser(false, true); + + // Recreate controller to use fake throttler + $controller = $this->getController(); + + $result = $controller->pageRegister($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 302); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testpageResendVerification(AccountController $controller) + { + $result = $controller->pageResendVerification($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testpageResetPassword(AccountController $controller) + { + $result = $controller->pageResetPassword($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testpageSetPassword(AccountController $controller) + { + $result = $controller->pageSetPassword($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + */ + public function testpageSettings() + { + // Create admin user. He will have access + $testUser = $this->createTestUser(true, true); + + // Recreate controller to use user + $controller = $this->getController(); + + $this->actualpageSettings($controller); + } + + /** + * @depends testControllerConstructor + * @depends testpageSettings + */ + public function testpageSettingsWithPartialPermissions() + { + // Create a user and give him permissions + $testUser = $this->createTestUser(false, true); + $this->giveUserTestPermission($testUser, 'uri_account_settings'); + + // Force config + $this->ci->config['site.locales.available'] = []; + + // Recreate controller to use config & user + $controller = $this->getController(); + + $this->actualpageSettings($controller); + } + + /** + * @param AccountController $controller + */ + protected function actualpageSettings(AccountController $controller) + { + $result = $controller->pageSettings($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testpageSettingsWithNoPermissions(AccountController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->pageSettings($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testpageSignIn(AccountController $controller) + { + $result = $controller->pageSignIn($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + * @depends testpageSignIn + */ + public function testpageSignInWithLoggedInUser() + { + // Create a test user + $testUser = $this->createTestUser(false, true); + + // Recreate controller to use fake throttler + $controller = $this->getController(); + + $result = $controller->pageSignIn($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 302); + } + + /** + * @depends testControllerConstructor + */ + public function testProfile() + { + // Create admin user. He will have access + $testUser = $this->createTestUser(true, true); + + // Force config + $this->ci->config['site.locales.available'] = [ + 'en_US' => 'English', + 'fr_FR' => 'Français', + ]; + + // Recreate controller to use user + $controller = $this->getController(); + + $this->performActualProfileTests($controller, $testUser); + } + + /** + * @depends testControllerConstructor + * @depends testProfile + */ + public function testProfileWithPartialPermissions() + { + // Create a user and give him permissions + $testUser = $this->createTestUser(false, true); + $this->giveUserTestPermission($testUser, 'update_account_settings'); + + // Force config + $this->ci->config['site.locales.available'] = [ + 'en_US' => 'English', + ]; + + // Recreate controller to use config & user + $controller = $this->getController(); + + $this->performActualProfileTests($controller, $testUser); + } + + /** + * @param AccountController $controller + * @param UserInterface $user + */ + protected function performActualProfileTests(AccountController $controller, UserInterface $user) + { + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'first_name' => 'foo', + //'last_name' => 'bar', // don't change this one + 'locale' => 'en_US', + ]); + + $result = $controller->profile($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was update + $editedUser = User::where('user_name', $user->user_name)->first(); + $this->assertSame('foo', $editedUser->first_name); + $this->assertSame($user->last_name, $editedUser->last_name); + $this->assertSame($user->locale, $editedUser->locale); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testProfile + * @param AccountController $controller + */ + public function testProfileWithNoPermissions(AccountController $controller) + { + $result = $controller->profile($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 403); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testProfile + */ + public function testProfileWithFailedValidation() + { + // Create admin user. He will have access + $testUser = $this->createTestUser(true, true); + + // Force config + $this->ci->config['site.locales.available'] = [ + 'en_US' => 'English', + 'fr_FR' => 'Français', + ]; + + // Recreate controller to use user + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([]); + + $result = $controller->profile($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testProfile + */ + public function testProfileWithInvalidLocale() + { + // Create admin user. He will have access + $user = $this->createTestUser(true, true); + + // Force config + $this->ci->config['site.locales.available'] = [ + 'en_US' => 'English', + 'fr_FR' => 'Français', + ]; + + // Recreate controller to use user + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'first_name' => 'foobarfoo', + 'locale' => 'foobarfoo', + ]); + + $result = $controller->profile($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was NOT updated + $editedUser = User::where('user_name', $user->user_name)->first(); + $this->assertNotSame('foobarfoo', $editedUser->first_name); + $this->assertSame($user->first_name, $editedUser->first_name); + $this->assertSame($user->last_name, $editedUser->last_name); + $this->assertSame($user->locale, $editedUser->locale); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testRegisterWithHoneypot(AccountController $controller) + { + $this->expectException(SpammyRequestException::class); + $controller->register($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testRegisterWithRegistrationDisabled(AccountController $controller) + { + // Force config + $this->ci->config['site.registration.enabled'] = false; + + // Recreate controller to use fake config + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'spiderbro' => 'http://', + ]); + + $result = $controller->register($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 403); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + */ + public function testRegisterWithLoggedInUser() + { + // Create test user + $user = $this->createTestUser(false, true); + + // Recreate controller to use user + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'spiderbro' => 'http://', + ]); + + $result = $controller->register($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 403); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testRegisterWithLoggedInUser + */ + public function testRegisterWithFailedThrottle() + { + // Create fake throttler + $throttler = m::mock(Throttler::class); + $throttler->shouldReceive('getDelay')->once()->with('registration_attempt')->andReturn(90); + $this->ci->throttler = $throttler; + + // Bypass security feature + $fm = $this->ci->factory; + $dummyUser = $fm->create(User::class); + $this->ci->config['reserved_user_ids.master'] = $dummyUser->id; + + // Recreate controller to use fake throttler + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'spiderbro' => 'http://', + ]); + + $result = $controller->register($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 429); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + * @depends testRegisterWithFailedThrottle + * @param AccountController $controller + */ + public function testRegisterWithFailedCaptcha(AccountController $controller) + { + // Bypass security feature + $fm = $this->ci->factory; + $dummyUser = $fm->create(User::class); + $this->ci->config['reserved_user_ids.master'] = $dummyUser->id; + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'spiderbro' => 'http://', + ]); + + $result = $controller->register($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testRegisterWithFailedCaptcha + * @param AccountController $controller + */ + public function testRegisterWithFailedValidation(AccountController $controller) + { + // Bypass security feature + $fm = $this->ci->factory; + $dummyUser = $fm->create(User::class); + $this->ci->config['reserved_user_ids.master'] = $dummyUser->id; + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'spiderbro' => 'http://', + 'captcha' => '', + ]); + + $result = $controller->register($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + */ + public function testresendVerification() + { + // Create fake mailer + $mailer = m::mock(Mailer::class); + $mailer->shouldReceive('send')->once()->with(\Mockery::type(TwigMailMessage::class)); + $this->ci->mailer = $mailer; + + // Create fake user to test + $user = $this->createTestUser(false, false, [ + 'flag_verified' => 0, + ]); + + // Recreate controller to use fake mailer + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'email' => $user->email, + ]); + + $result = $controller->resendVerification($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testresendVerification + */ + public function testresendVerificationWithVerifiedUser() + { + // Create fake user to test + $user = $this->createTestUser(false, false, [ + 'flag_verified' => 1, + ]); + + // Recreate controller to use fake mailer + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'email' => $user->email, + ]); + + $result = $controller->resendVerification($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testresendVerification + */ + public function testresendVerificationWithFailedThrottle() + { + // Create fake throttler + $throttler = m::mock(Throttler::class); + $throttler->shouldReceive('getDelay')->once()->with('verification_request', ['email' => 'testresendVerificationWithVerifiedUser@test.com'])->andReturn(90); + $this->ci->throttler = $throttler; + + // Recreate controller to use fake throttler + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'email' => 'testresendVerificationWithVerifiedUser@test.com', + ]); + + $result = $controller->resendVerification($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 429); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + * @depends testresendVerification + * @param AccountController $controller + */ + public function testresendVerificationWithFailedValidation(AccountController $controller) + { + // Set POST + $request = $this->getRequest()->withParsedBody([]); + + $result = $controller->resendVerification($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + */ + public function testSetPassword() + { + // Create fake user to test + $user = $this->createTestUser(false, true); + + // Create fake PasswordResetRepository + $resetModel = $this->ci->repoPasswordReset->create($user, 9999); + + // Recreate controller to use fake PasswordResetRepository + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'password' => 'testSetPassword', + 'passwordc' => 'testSetPassword', + 'token' => $resetModel->getToken(), + ]); + + $result = $controller->setPassword($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testSetPassword + * @param AccountController $controller + */ + public function testSetPasswordWithNoToken(AccountController $controller) + { + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'password' => 'testSetPassword', + 'passwordc' => 'testSetPassword', + 'token' => 'potato', + ]); + + $result = $controller->setPassword($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testSetPassword + * @param AccountController $controller + */ + public function testsetPasswordWithFailedValidation(AccountController $controller) + { + // Set POST + $request = $this->getRequest()->withParsedBody([]); + + $result = $controller->setPassword($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + */ + public function testSettings() + { + // Create fake admin to test + $user = $this->createTestUser(true, true); + + // Faker doesn't hash the password. Let's do that now + $unhashed = $user->password; + $user->password = Password::hash($user->password); + $user->save(); + + // Recreate controller to use fake user + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'passwordcheck' => $unhashed, + 'email' => 'testSettings@test.com', + 'password' => 'testrSetPassword', + 'passwordc' => 'testrSetPassword', + ]); + + $result = $controller->settings($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testSettings + */ + public function testSettingsOnlyEmailNoLocale() + { + // Create fake admin to test + $user = $this->createTestUser(true, true); + + // Faker doesn't hash the password. Let's do that now + $unhashed = $user->password; + $user->password = Password::hash($user->password); + $user->save(); + + // Force locale config + $this->ci->config['site.registration.user_defaults.locale'] = 'en_US'; + $this->ci->config['site.locales.available'] = [ + 'en_US' => 'English', + ]; + + // Recreate controller to use fake user + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'passwordcheck' => $unhashed, + 'email' => 'testSettings@test.com', + 'password' => '', + 'passwordc' => '', + ]); + + $result = $controller->settings($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testSettings + */ + public function testSettingsWithNoPermissions() + { + // Create fake normal user to test + $user = $this->createTestUser(false, true); + + // Recreate controller to use fake user + $controller = $this->getController(); + + $result = $controller->settings($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 403); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testSettings + */ + public function testSettingsWithFailedValidation() + { + // Create fake normal user to test + $user = $this->createTestUser(true, true); + + // Recreate controller to use fake user + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([]); + + $result = $controller->settings($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testSettings + */ + public function testSettingsWithFailedPasswordCheck() + { + // Create fake admin to test + $user = $this->createTestUser(true, true); + + // Faker doesn't hash the password. Let's do that now + $unhashed = $user->password; + $user->password = Password::hash($user->password); + $user->save(); + + // Recreate controller to use fake user + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'passwordcheck' => 'foo', + 'email' => 'testSettings@test.com', + 'password' => 'testrSetPassword', + 'passwordc' => 'testrSetPassword', + ]); + + $result = $controller->settings($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testSettings + */ + public function testSettingsWithEmailInUse() + { + // Create user which will be the duplicate email + $firstUser = $this->createTestUser(); + + // Create fake admin to test + $user = $this->createTestUser(true, true); + + // Recreate controller to use fake user + $controller = $this->getController(); + + // Set POST + $request = $this->getRequest()->withParsedBody([ + 'email' => $firstUser->email, + 'password' => '', + ]); + + $result = $controller->settings($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @param AccountController $controller + */ + public function testSuggestUsername(AccountController $controller) + { + $result = $controller->suggestUsername($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + + $body = (string) $result->getBody(); + $this->assertNotSame('[]', $body); + + // Make sure we got a string + $data = json_decode($body, true); + $this->assertInternalType('string', $data['user_name']); + $this->assertNotSame('', $data['user_name']); + } + + /** + * @depends testControllerConstructor + */ + public function testVerify() + { + // Create fake VerificationRepository + $repoVerification = m::mock(VerificationRepository::class); + $repoVerification->shouldReceive('complete')->once()->with('potato')->andReturn(true); + $this->ci->repoVerification = $repoVerification; + + // Recreate controller to use fake PasswordResetRepository + $controller = $this->getController(); + + $request = $this->getRequest()->withQueryParams([ + 'token' => 'potato', + ]); + + $result = $controller->verify($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 302); + $this->assertEquals($this->ci->router->pathFor('login'), $result->getHeaderLine('Location')); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testVerify + */ + public function testVerifyWithFailedVerification() + { + // Create fake VerificationRepository + $repoVerification = m::mock(VerificationRepository::class); + $repoVerification->shouldReceive('complete')->once()->with('potato')->andReturn(false); + $this->ci->repoVerification = $repoVerification; + + // Recreate controller to use fake PasswordResetRepository + $controller = $this->getController(); + + $request = $this->getRequest()->withQueryParams([ + 'token' => 'potato', + ]); + + $result = $controller->verify($request, $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 302); + $this->assertEquals($this->ci->router->pathFor('login'), $result->getHeaderLine('Location')); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructor + * @depends testVerify + */ + public function testVerifyWithFailedValidation() + { + // Create fake VerificationRepository + $repoVerification = m::mock(VerificationRepository::class); + $repoVerification->shouldNotReceive('complete'); + $this->ci->repoVerification = $repoVerification; + + // Recreate controller to use fake PasswordResetRepository + $controller = $this->getController(); + + $result = $controller->verify($this->getRequest(), $this->getResponse(), []); + $this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $result); + $this->assertSame($result->getStatusCode(), 302); + $this->assertEquals($this->ci->router->pathFor('login'), $result->getHeaderLine('Location')); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @return AccountController + */ + private function getController() + { + return new AccountController($this->ci); + } +} diff --git a/app/sprinkles/account/tests/Integration/Database/Models/UserModelTest.php b/app/sprinkles/account/tests/Integration/Database/Models/UserModelTest.php new file mode 100644 index 000000000..0b08b3003 --- /dev/null +++ b/app/sprinkles/account/tests/Integration/Database/Models/UserModelTest.php @@ -0,0 +1,98 @@ +setupTestDatabase(); + $this->refreshDatabase(); + } + + /** + * Test user hard deletion with user relations. + * This is not a totaly acurate test, as each relations are added manually + * and new relations might not be added automatically to accuratly test + */ + public function testUserHardDeleteWithUserRelations() + { + $fm = $this->ci->factory; + + // Create a user & make sure it exist + $user = $this->createTestUser(); + $this->assertInstanceOf(User::class, User::withTrashed()->find($user->id)); + + //$user->activities - activities + $this->ci->userActivityLogger->info('test', [ + 'type' => 'group_create', + 'user_id' => $user->id, + ]); + $this->assertSame(1, $user->activities()->count()); + + //$user->passwordResets - password_resets + $this->ci->repoPasswordReset->create($user, $this->ci->config['password_reset.timeouts.reset']); + $this->assertSame(1, $user->passwordResets()->count()); + + //{no relations} - persistences + $persistence = new Persistence([ + 'user_id' => $user->id, + 'token' => '', + 'persistent_token' => '', + 'expires_at' => null, + ]); + $persistence->save(); + $this->assertSame(1, Persistence::where('user_id', $user->id)->count()); + + //$user->roles - role_users + $role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role'); + $user->roles()->attach($role->id); + $this->assertSame(1, $user->roles()->count()); + + //{no relations} - verification + $this->ci->repoVerification->create($user, $this->ci->config['verification.timeout']); + $this->assertSame(1, $this->ci->classMapper->staticMethod('verification', 'where', 'user_id', $user->id)->count()); + + // Force delete. Now user can't be found at all + $this->assertTrue($user->delete(true)); + $this->assertNull(User::withTrashed()->find($user->id)); + + // Assert deletions worked + $this->assertSame(0, $user->activities()->count()); + $this->assertSame(0, $user->passwordResets()->count()); + $this->assertSame(0, $user->roles()->count()); + $this->assertSame(0, Persistence::where('user_id', $user->id)->count()); + $this->assertSame(0, $this->ci->classMapper->staticMethod('verification', 'where', 'user_id', $user->id)->count()); + } +} diff --git a/app/sprinkles/account/tests/Unit/FactoriesTest.php b/app/sprinkles/account/tests/Integration/FactoriesTest.php similarity index 68% rename from app/sprinkles/account/tests/Unit/FactoriesTest.php rename to app/sprinkles/account/tests/Integration/FactoriesTest.php index 841772d54..1395839c7 100644 --- a/app/sprinkles/account/tests/Unit/FactoriesTest.php +++ b/app/sprinkles/account/tests/Integration/FactoriesTest.php @@ -1,5 +1,6 @@ setupTestDatabase(); $this->refreshDatabase(); - } - /** - * Test the user factory - */ - public function testUserFactory() - { $fm = $this->ci->factory; $user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User'); - $this->assertInstanceOf('UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface', $user); + $this->assertInstanceOf(UserInterface::class, $user); } } diff --git a/app/sprinkles/account/tests/Unit/PDOStorageTest.php b/app/sprinkles/account/tests/Integration/PDOStorageTest.php similarity index 96% rename from app/sprinkles/account/tests/Unit/PDOStorageTest.php rename to app/sprinkles/account/tests/Integration/PDOStorageTest.php index faa5819b5..6e640f62e 100644 --- a/app/sprinkles/account/tests/Unit/PDOStorageTest.php +++ b/app/sprinkles/account/tests/Integration/PDOStorageTest.php @@ -1,5 +1,6 @@ $this->testUser->id, 'token' => 'dummy', 'persistent_token' => 'dummy', - 'expires_at' => null + 'expires_at' => null, ]); $persistence->save(); $this->storage->cleanAllTriplets($this->testUser->id); @@ -126,7 +127,7 @@ public function testCleanExpiredTokens() 'user_id' => $this->testUser->id, 'token' => 'dummy', 'persistent_token' => 'dummy', - 'expires_at' => Carbon::now()->subHour(1) + 'expires_at' => Carbon::now()->subHour(1), ]); $persistence->save(); $this->assertEquals(2, Persistence::count()); @@ -144,7 +145,7 @@ protected function insertTestData() 'user_id' => $this->testUser->id, 'token' => $this->validDBToken, 'persistent_token' => $this->validDBPersistentToken, - 'expires_at' => $this->expire + 'expires_at' => $this->expire, ]); $persistence->save(); diff --git a/app/sprinkles/account/tests/Unit/RegistrationTest.php b/app/sprinkles/account/tests/Integration/RegistrationTest.php similarity index 52% rename from app/sprinkles/account/tests/Unit/RegistrationTest.php rename to app/sprinkles/account/tests/Integration/RegistrationTest.php index dead5af3f..1906f6c1f 100644 --- a/app/sprinkles/account/tests/Unit/RegistrationTest.php +++ b/app/sprinkles/account/tests/Integration/RegistrationTest.php @@ -1,5 +1,6 @@ 'FooBar', + 'first_name' => 'Foo', + 'last_name' => 'Bar', + 'email' => 'Foo@Bar.com', + 'password' => 'FooBarFooBar123', + ]; + public function tearDown() { parent::tearDown(); @@ -45,7 +57,43 @@ public function setUp() } /** - * testNormalRegistration + * Test validation works + */ + public function testValidation() + { + $registration = new Registration($this->ci, [ + 'user_name' => 'OwlFancy', + 'first_name' => 'Owl', + 'last_name' => 'Fancy', + 'email' => 'owl@fancy.com', + 'password' => 'owlFancy1234', + ]); + + $validation = $registration->validate(); + $this->assertTrue($validation); + } + + /** + * Test the $requiredProperties property + * @depends testValidation + * @expectedException UserFrosting\Support\Exception\HttpException + * @expectedExceptionMessage Account can't be registrated as 'first_name' is required to create a new user. + */ + public function testMissingFields() + { + $registration = new Registration($this->ci, [ + 'user_name' => 'OwlFancy', + //'first_name' => 'Owl', + 'last_name' => 'Fancy', + 'email' => 'owl@fancy.com', + 'password' => 'owlFancy1234', + ]); + + $validation = $registration->validate(); + } + + /** + * @depends testValidation */ public function testNormalRegistration() { @@ -56,77 +104,53 @@ public function testNormalRegistration() // Tests can't mail properly $this->ci->config['site.registration.require_email_verification'] = false; - // Genereate user data - $fakeUserData = [ - 'user_name' => 'FooBar', - 'first_name' => 'Foo', - 'last_name' => 'Bar', - 'email' => 'Foo@Bar.com', - 'password' => 'FooBarFooBar123' - ]; - // Get class - $registration = new Registration($this->ci, $fakeUserData); + $registration = new Registration($this->ci, $this->fakeUserData); $this->assertInstanceOf(Registration::class, $registration); // Register user $user = $registration->register(); - // Registration should return a valid user + // Registration should return a valid user, with a new ID $this->assertInstanceOf(UserInterface::class, $user); $this->assertEquals('FooBar', $user->user_name); + $this->assertInternalType('int', $user->id); - // We try to register the same user again. Should throw an error - $registration = new Registration($this->ci, $fakeUserData); - $this->expectException(HttpException::class); - $validation = $registration->validate(); - - // Should throw email error if we change the username - $fakeUserData['user_name'] = 'BarFoo'; - $registration = new Registration($this->ci, $fakeUserData); - $this->expectException(HttpException::class); - $validation = $registration->validate(); + // Make sure the user is added to the db by querying it + $users = User::where('email', 'Foo@Bar.com')->get(); + $this->assertCount(1, $users); + $this->assertSame('FooBar', $users->first()['user_name']); } /** - * Test validation works + * @depends testNormalRegistration + * @expectedException UserFrosting\Support\Exception\HttpException + * @expectedExceptionMessage Username is already in use. */ - public function testValidation() + public function testValidationWithDuplicateUsername() { - // Reset database - $this->refreshDatabase(); + // Create the first user to test against + $this->testNormalRegistration(); - $registration = new Registration($this->ci, [ - 'user_name' => 'FooBar', - 'first_name' => 'Foo', - 'last_name' => 'Bar', - 'email' => 'Foo@Bar.com', - 'password' => 'FooBarFooBar123' - ]); - - // Validate user. Shouldn't tell us the username is already in use since we reset the database + // We try to register the same user again. Should throw an error + $registration = new Registration($this->ci, $this->fakeUserData); $validation = $registration->validate(); - $this->assertTrue($validation); } /** - * Test the $requiredProperties property + * @depends testNormalRegistration + * @expectedException UserFrosting\Support\Exception\HttpException + * @expectedExceptionMessage Email is already in use. */ - public function testMissingFields() + public function testValidationWithDuplicateEmail() { - // Reset database - $this->refreshDatabase(); + // Create the first user to test against + $this->testNormalRegistration(); - $registration = new Registration($this->ci, [ - 'user_name' => 'FooBar', - //'first_name' => 'Foo', - 'last_name' => 'Bar', - 'email' => 'Foo@Bar.com', - 'password' => 'FooBarFooBar123' - ]); - - // Validate user. Shouldn't tell us the username is already in use since we reset the database - $this->expectException(HttpException::class); + // Should throw email error if we change the username + $fakeUserData = $this->fakeUserData; + $fakeUserData['user_name'] = 'BarFoo'; + $registration = new Registration($this->ci, $fakeUserData); $validation = $registration->validate(); } } diff --git a/app/sprinkles/account/tests/Integration/ServicesProvider/AlertsServiceTest.php b/app/sprinkles/account/tests/Integration/ServicesProvider/AlertsServiceTest.php new file mode 100644 index 000000000..12fa2f858 --- /dev/null +++ b/app/sprinkles/account/tests/Integration/ServicesProvider/AlertsServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(AuthGuard::class, $this->ci->authGuard); + } +} diff --git a/app/sprinkles/account/tests/Integration/ServicesProvider/AuthLoggerServiceTest.php b/app/sprinkles/account/tests/Integration/ServicesProvider/AuthLoggerServiceTest.php new file mode 100644 index 000000000..b975ec50d --- /dev/null +++ b/app/sprinkles/account/tests/Integration/ServicesProvider/AuthLoggerServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(Logger::class, $this->ci->authLogger); + } +} diff --git a/app/sprinkles/account/tests/Integration/ServicesProvider/AuthorizerServiceTest.php b/app/sprinkles/account/tests/Integration/ServicesProvider/AuthorizerServiceTest.php new file mode 100644 index 000000000..e09ae5e4e --- /dev/null +++ b/app/sprinkles/account/tests/Integration/ServicesProvider/AuthorizerServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(AuthorizationManager::class, $this->ci->authorizer); + } +} diff --git a/app/sprinkles/account/tests/Integration/ServicesProvider/CurrentUserServiceTest.php b/app/sprinkles/account/tests/Integration/ServicesProvider/CurrentUserServiceTest.php new file mode 100644 index 000000000..c46ab735f --- /dev/null +++ b/app/sprinkles/account/tests/Integration/ServicesProvider/CurrentUserServiceTest.php @@ -0,0 +1,43 @@ +assertNull($this->ci->currentUser); + } + + public function testService() + { + $this->setupTestDatabase(); + $this->refreshDatabase(); + + $testUser = $this->createTestUser(false, true); + + $this->assertInstanceOf(UserInterface::class, $this->ci->currentUser); + } +} diff --git a/app/sprinkles/account/tests/Integration/ServicesProvider/PasswordHasherServiceTest.php b/app/sprinkles/account/tests/Integration/ServicesProvider/PasswordHasherServiceTest.php new file mode 100644 index 000000000..27c0eed62 --- /dev/null +++ b/app/sprinkles/account/tests/Integration/ServicesProvider/PasswordHasherServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(Hasher::class, $this->ci->passwordHasher); + } +} diff --git a/app/sprinkles/account/tests/Integration/ServicesProvider/RepoPasswordResetServiceTest.php b/app/sprinkles/account/tests/Integration/ServicesProvider/RepoPasswordResetServiceTest.php new file mode 100644 index 000000000..ca8142833 --- /dev/null +++ b/app/sprinkles/account/tests/Integration/ServicesProvider/RepoPasswordResetServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(PasswordResetRepository::class, $this->ci->repoPasswordReset); + } +} diff --git a/app/sprinkles/account/tests/Integration/ServicesProvider/RepoVerificationServiceTest.php b/app/sprinkles/account/tests/Integration/ServicesProvider/RepoVerificationServiceTest.php new file mode 100644 index 000000000..6ca996976 --- /dev/null +++ b/app/sprinkles/account/tests/Integration/ServicesProvider/RepoVerificationServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(VerificationRepository::class, $this->ci->repoVerification); + } +} diff --git a/app/sprinkles/account/tests/Integration/ServicesProvider/UserActivityLoggerServiceTest.php b/app/sprinkles/account/tests/Integration/ServicesProvider/UserActivityLoggerServiceTest.php new file mode 100644 index 000000000..602c20941 --- /dev/null +++ b/app/sprinkles/account/tests/Integration/ServicesProvider/UserActivityLoggerServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(Logger::class, $this->ci->userActivityLogger); + } +} diff --git a/app/sprinkles/account/tests/Integration/UserModelTest.php b/app/sprinkles/account/tests/Integration/UserModelTest.php new file mode 100644 index 000000000..2f6c0886f --- /dev/null +++ b/app/sprinkles/account/tests/Integration/UserModelTest.php @@ -0,0 +1,69 @@ +setupTestDatabase(); + $this->refreshDatabase(); + } + + /** + * Test user soft deletion. + */ + public function testUserSoftDelete() + { + // Create a user & make sure it exist + $user = $this->createTestUser(); + $this->assertInstanceOf(User::class, User::withTrashed()->find($user->id)); + + // Soft Delete. User won't be found using normal query, but will withTrash + $this->assertTrue($user->delete()); + $this->assertNull(User::find($user->id)); + $this->assertInstanceOf(User::class, User::withTrashed()->find($user->id)); + } + + /** + * Test user hard deletion. + */ + public function testUserHardDelete() + { + // Create a user & make sure it exist + $user = $this->createTestUser(); + $this->assertInstanceOf(User::class, User::withTrashed()->find($user->id)); + + // Force delete. Now user can't be found at all + $this->assertTrue($user->delete(true)); + $this->assertNull(User::withTrashed()->find($user->id)); + } +} diff --git a/app/sprinkles/account/tests/Unit/HasherTest.php b/app/sprinkles/account/tests/Unit/Authenticate/HasherTest.php similarity index 95% rename from app/sprinkles/account/tests/Unit/HasherTest.php rename to app/sprinkles/account/tests/Unit/Authenticate/HasherTest.php index 4bc6c11f6..570815ede 100644 --- a/app/sprinkles/account/tests/Unit/HasherTest.php +++ b/app/sprinkles/account/tests/Unit/Authenticate/HasherTest.php @@ -1,5 +1,6 @@ ci->config['reserved_user_ids.master']; } else { - $user_id = rand(0, 1222); + $user_id = $this->getRandomUserId($this->ci->config['reserved_user_ids.master']); } - $params = array_merge(['id' => $user_id], $params); + // If user exist, returns it, otherwise create a new one + if (!$user = User::find($user_id)) { + $params = array_merge(['id' => $user_id], $params); - $fm = $this->ci->factory; - $user = $fm->create(User::class, $params); + $fm = $this->ci->factory; + $user = $fm->create(User::class, $params); + } if ($login) { $this->loginUser($user); @@ -69,6 +73,20 @@ protected function createTestUser($isMaster = false, $login = false, array $para return $user; } + /** + * Returns a random user id, exclusing th master id + * @param int $masterId + * @return int + */ + protected function getRandomUserId($masterId) + { + do { + $id = mt_rand(1, 9999); + } while (in_array($id, [$masterId])); + + return $id; + } + /** * Gives a user a new test permission * @param UserInterface $user @@ -83,7 +101,7 @@ protected function giveUserTestPermission(UserInterface $user, $slug, $condition $permission = $fm->create(Permission::class, [ 'slug' => $slug, - 'conditions' => $conditions + 'conditions' => $conditions, ]); // Add the permission to the user diff --git a/app/sprinkles/admin/composer.json b/app/sprinkles/admin/composer.json index a326ee6a5..ee4c43c7f 100644 --- a/app/sprinkles/admin/composer.json +++ b/app/sprinkles/admin/composer.json @@ -11,9 +11,6 @@ "homepage": "https://alexanderweissman.com" } ], - "require": { - "php": ">=5.6" - }, "autoload": { "psr-4": { "UserFrosting\\Sprinkle\\Admin\\": "src/" diff --git a/app/sprinkles/admin/locale/ar/messages.php b/app/sprinkles/admin/locale/ar/messages.php index 8c57858df..5622b715d 100644 --- a/app/sprinkles/admin/locale/ar/messages.php +++ b/app/sprinkles/admin/locale/ar/messages.php @@ -1,5 +1,6 @@ 'النشاط الاخير', 'PAGE' => 'قائمة من أنشطة المستخدم', - 'TIME' => 'وقت نشاط' + 'TIME' => 'وقت نشاط', ], 'CACHE' => [ 'CLEAR' => 'مسح ذاكرة التخزين', 'CLEAR_CONFIRM' => 'هل أنت متأكد أنك تريد مسح ذاكرة التخزين بالموقع؟', 'CLEAR_CONFIRM_YES' => 'نعم، إمسح ذاكرة التخزين', - 'CLEARED' => 'تم مسح ذاكرة التخزين بنجاح' + 'CLEARED' => 'تم مسح ذاكرة التخزين بنجاح', ], 'DASHBOARD' => 'لوحة القيادة', @@ -54,13 +55,13 @@ //"MANAGE" => "Manage group", 'NAME' => 'أسم المجموعة', 'NAME_EXPLAIN' => 'ادخال اسم للمجموعة', - 'PAGE_DESCRIPTION' => 'قائمة المجموعات لموقعك يوفر أدوات لإدارة التحرير وحذف مجموعات' + 'PAGE_DESCRIPTION' => 'قائمة المجموعات لموقعك يوفر أدوات لإدارة التحرير وحذف مجموعات', ], 'MANUALLY_ACTIVATED' => 'تم تفعيل حساب{{user_name}}', 'MASTER_ACCOUNT_EXISTS' => 'الحساب الرئيسي موجود بالفعل', 'MIGRATION' => [ - 'REQUIRED' => 'تحديث قاعدة البيانات مطلوب' + 'REQUIRED' => 'تحديث قاعدة البيانات مطلوب', ], 'PERMISSION' => [ @@ -71,7 +72,7 @@ 'HOOK_CONDITION' => 'الظروف', 'MANAGE' => 'إدارة المأذونات', 'PAGE_DESCRIPTION' => 'قائمة المأذونات لموقعك', - 'UPDATE' => 'تحديث المأذونات' + 'UPDATE' => 'تحديث المأذونات', ], 'ROLE' => [ @@ -89,7 +90,7 @@ 'NAME' => 'اسم', 'NAME_EXPLAIN' => 'أدخل اسما للدور', 'PAGE_DESCRIPTION' => 'قائمة الوظائف لموقعك', - 'UPDATED' => 'تحديث الوظائف' + 'UPDATED' => 'تحديث الوظائف', ], 'SYSTEM_INFO' => [ @@ -102,7 +103,7 @@ 'SERVER' => 'برنامج الخادم', 'SPRINKLES' => 'sprinkles المحمل', 'UF_VERSION' => 'إصدار UserFrosting', - 'URL' => 'رابط قاعدة الموقع' + 'URL' => 'رابط قاعدة الموقع', ], 'USER' => [ @@ -112,7 +113,7 @@ 'ADMIN' => [ 'CHANGE_PASSWORD' => 'تغيير كلمة المرور للمستخدم', 'SEND_PASSWORD_LINK' => 'إرسال المستخدم وصلة من شأنها أن تسمح لهم لاختيار كلمة المرور الخاصة بهم', - 'SET_PASSWORD' => 'تعيين كلمة المرور الخاصة بالمستخدم' + 'SET_PASSWORD' => 'تعيين كلمة المرور الخاصة بالمستخدم', ], 'ACTIVATE' => 'تفعيل المستخدم', @@ -126,11 +127,11 @@ 'INFO_PAGE' => 'صفحة معلومات المستخدم {{name}}', 'PAGE_DESCRIPTION' => 'قائمة المستخدمين لموقعك', 'LATEST' => 'أحدث المستخدمين', - 'VIEW_ALL' => 'عرض جميع المستخدمين' + 'VIEW_ALL' => 'عرض جميع المستخدمين', ], 'X_USER' => [ 0 => 'لا يوجد اي مستخدمين', 1 => '{{plural}} مستخدم', - 2 => '{{plural}} المستخدمين' - ] + 2 => '{{plural}} المستخدمين', + ], ]; diff --git a/app/sprinkles/admin/locale/de_DE/messages.php b/app/sprinkles/admin/locale/de_DE/messages.php index 575a73a18..50946cea5 100644 --- a/app/sprinkles/admin/locale/de_DE/messages.php +++ b/app/sprinkles/admin/locale/de_DE/messages.php @@ -1,5 +1,6 @@ 'Letzte Aktivität', 'PAGE' => 'Eine Auflistung der Benutzeraktivitäten', - 'TIME' => 'Aktivitätszeit' + 'TIME' => 'Aktivitätszeit', ], 'CACHE' => [ 'CLEAR' => 'Cache löschen', 'CLEAR_CONFIRM' => 'Sind Sie sicher, dass Sie den Seiten-Cache löschen möchten?', 'CLEAR_CONFIRM_YES' => 'Ja, Cache löschen', - 'CLEARED' => 'Cache wurde erfolgreich gelöscht!' + 'CLEARED' => 'Cache wurde erfolgreich gelöscht!', ], 'DASHBOARD' => 'Übersicht', @@ -63,13 +64,13 @@ 'NOT_EMPTY' => 'Sie können das nicht tun, denn es sind noch Benutzer mit der Gruppe {{name}} verbunden.', 'PAGE_DESCRIPTION' => 'Eine Liste der Gruppen für Ihre Website. Bietet Verwaltungstools für das Bearbeiten und Löschen von Gruppen.', 'SUMMARY' => 'Gruppen Zusammenfassung', - 'UPDATE' => 'Details für die Gruppe {{name}} aktualisiert' + 'UPDATE' => 'Details für die Gruppe {{name}} aktualisiert', ], 'MANUALLY_ACTIVATED' => "{{user_name}}'s Konto wurde manuell aktiviert.", 'MASTER_ACCOUNT_EXISTS' => 'Das Root-Konto existiert bereits!', 'MIGRATION' => [ - 'REQUIRED' => 'Datenbankaktualisierung erforderlich' + 'REQUIRED' => 'Datenbankaktualisierung erforderlich', ], 'PERMISSION' => [ @@ -85,7 +86,7 @@ 'PAGE_DESCRIPTION' => 'Eine Liste der Berechtigungen für Ihre Website. Bietet Verwaltungstools zum Bearbeiten und Löschen von Berechtigungen.', 'SUMMARY' => 'Berechtigungs Zusammenfassung', 'UPDATE' => 'Berechtigungen aktualisieren', - 'VIA_ROLES' => 'Besitzt die Berechtigung durch die Rolle' + 'VIA_ROLES' => 'Besitzt die Berechtigung durch die Rolle', ], 'ROLE' => [ @@ -110,7 +111,7 @@ 'PAGE_DESCRIPTION' => 'Eine Liste der Rollen für Ihre Website. Bietet Verwaltungstools zum Bearbeiten und Löschen von Rollen.', 'PERMISSIONS_UPDATED' => 'Berechtigungen für die Rolle {{name}} aktualisiert', 'SUMMARY' => 'Rollen Zusammenfassung', - 'UPDATED' => 'Rollen aktualisieren' + 'UPDATED' => 'Rollen aktualisieren', ], 'SYSTEM_INFO' => [ @@ -123,7 +124,7 @@ 'SERVER' => 'Web-Server-Software', 'SPRINKLES' => 'Geladene Sprinkles', 'UF_VERSION' => 'UserFrosting Version', - 'URL' => 'Website-Stamm-Url' + 'URL' => 'Website-Stamm-Url', ], 'TOGGLE_COLUMNS' => 'Spalten anpassen', @@ -135,7 +136,7 @@ 'ADMIN' => [ 'CHANGE_PASSWORD' => 'Benutzerpasswort ändern', 'SEND_PASSWORD_LINK' => 'Senden Sie dem Benutzer einen Link, der ihnen erlaubt, ihr eigenes Passwort zu wählen', - 'SET_PASSWORD' => 'Setzen Sie das Passwort des Benutzers als' + 'SET_PASSWORD' => 'Setzen Sie das Passwort des Benutzers als', ], 'ACTIVATE' => 'Benutzer aktivieren', @@ -152,11 +153,11 @@ 'PAGE_DESCRIPTION' => 'Eine Liste der Benutzer für Ihre Website. Bietet Management-Tools, einschließlich der Möglichkeit, Benutzerdaten bearbeiten, manuell aktivieren, Benutzer aktivieren/deaktivieren, und vieles mehr.', 'SUMMARY' => 'Benutzer Zusammenfassung', 'VIEW_ALL' => 'Alle Benutzer anzeigen', - 'WITH_PERMISSION' => 'Benutzer mit dieser Berechtigung' + 'WITH_PERMISSION' => 'Benutzer mit dieser Berechtigung', ], 'X_USER' => [ 0 => 'Keine Benutzer', 1 => '{{plural}} Benutzer', - 2 => '{{plural}} Benutzer' - ] + 2 => '{{plural}} Benutzer', + ], ]; diff --git a/app/sprinkles/admin/locale/el/messages.php b/app/sprinkles/admin/locale/el/messages.php index 60838e1a6..54f3d4e22 100644 --- a/app/sprinkles/admin/locale/el/messages.php +++ b/app/sprinkles/admin/locale/el/messages.php @@ -1,160 +1,157 @@ [ - 1 => "Δραστηριότητα", - 2 => "Δραστηριότητες", + 'ACTIVITY' => [ + 1 => 'Δραστηριότητα', + 2 => 'Δραστηριότητες', - "LAST" => "Τελευταία δραστηριότητα", - "PAGE" => "Λίστα δραστηριοτήτων των χρηστών", - "TIME" => "Χρόνος δραστηριότητας" + 'LAST' => 'Τελευταία δραστηριότητα', + 'PAGE' => 'Λίστα δραστηριοτήτων των χρηστών', + 'TIME' => 'Χρόνος δραστηριότητας', ], - "CACHE" => [ - "CLEAR" => "Διαγραφή της προσωρινής μνήμης", - "CLEAR_CONFIRM" => "Είστε βέβαιοι ότι θέλετε να εκκαθαρίσετε την προσωρινή μνήμη του ιστότοπου;", - "CLEAR_CONFIRM_YES" => "Ναι, διαγραφή της προσωρινής μνήμης", - "CLEARED" => "Η προσωρινή μνήμη διαγράφηκε με επιτυχία!" + 'CACHE' => [ + 'CLEAR' => 'Διαγραφή της προσωρινής μνήμης', + 'CLEAR_CONFIRM' => 'Είστε βέβαιοι ότι θέλετε να εκκαθαρίσετε την προσωρινή μνήμη του ιστότοπου;', + 'CLEAR_CONFIRM_YES' => 'Ναι, διαγραφή της προσωρινής μνήμης', + 'CLEARED' => 'Η προσωρινή μνήμη διαγράφηκε με επιτυχία!', ], - "DASHBOARD" => "Πίνακας ελέγχου", - "NO_FEATURES_YET" => "Δεν φαίνεται να έχει ρυθμιστεί καμία λειτουργία για αυτόν τον λογαριασμό ... ακόμα. ίσως δεν έχουν υλοποιηθεί ακόμη, ή ίσως κάποιος να ξέχασε να σας δώσει πρόσβαση. Χαιρόμαστε πάντως που είσαι μαζί μας! ", - "DELETE_MASTER" => "Δεν μπορείτε να διαγράψετε τον κύριο λογαριασμό!", - "DELETION_SUCCESSFUL" => "Ο χρήστης {{user_name}} διαγράφηκε.", - "DETAILS_UPDATED" => "Ενημέρωθηκαν οι πληροφορίες λογαριασμού για τον χρήστη {{user_name}}", - "DISABLE_MASTER" => "Δεν μπορείτε να απενεργοποιήσετε τον κύριο λογαριασμό!", - "DISABLE_SELF" => "Δεν μπορείτε να απενεργοποιήσετε τον δικό σας λογαριασμό!", - "DISABLE_SUCCESSFUL" => "Ο λογαριασμός του χρήστη {{user_name}} απενεργοποιήθηκε.", - - "ENABLE_SUCCESSFUL" => "Ο λογαριασμός του χρήστη {{user_name}} ενεργοποιήθηκε.", - - "GROUP" => [ - 1 => "Ομάδα", - 2 => "Ομάδες", - - "CREATE" => "Δημιουργία ομάδας", - "CREATION_SUCCESSFUL" => "Η ομάδα {{name}} δημιουργήθηκε", - "DELETE" => "Διαγραφή ομάδας", - "DELETE_CONFIRM" => "Είστε βέβαιοι ότι θέλετε να διαγράψετε την ομάδα {{name}}?", - "DELETE_DEFAULT" => "Δεν μπορείτε να διαγράψετε την ομάδα {{name}} επειδή είναι η προεπιλεγμένη ομάδα για τους νεοεισερχόμενους χρήστες.", - "DELETE_YES" => "Ναι, διαγραφή ομάδας", - "DELETION_SUCCESSFUL" => "Η ομάδα {{name}} διαγράφηκε", - "EDIT" => "Επεξεργασία ομάδας", - "ICON" => "Εικονίδιο ομάδας", - "ICON_EXPLAIN" => "Εικονίδιο για τα μέλη της ομάδας", - "INFO_PAGE" => "Σελίδα πληροφοριών για την ομάδα {{name}}", - "MANAGE" => "Διαχείριση ομάδας", - "NAME" => "Όνομα ομάδας", - "NAME_EXPLAIN" => "Παρακαλώ εισάγετε ένα όνομα για την ομάδα", - "NOT_EMPTY" => "Δεν μπορείτε να το κάνετε αυτό επειδή εξακολουθούν να υπάρχουν χρήστες που είναι μέλη της ομάδας {{name}}.", - "PAGE_DESCRIPTION" => "Λίστα των ομάδων του ιστότοπού σας. Παρέχει εργαλεία διαχείρισης για την επεξεργασία και τη διαγραφή ομάδων.", - "SUMMARY" => "Σύνοψη ομάδας", - "UPDATE" => "Ενημερώθηκαν οι λεπτομέρειες της ομάδας {{name}}" + 'DASHBOARD' => 'Πίνακας ελέγχου', + 'NO_FEATURES_YET' => 'Δεν φαίνεται να έχει ρυθμιστεί καμία λειτουργία για αυτόν τον λογαριασμό ... ακόμα. ίσως δεν έχουν υλοποιηθεί ακόμη, ή ίσως κάποιος να ξέχασε να σας δώσει πρόσβαση. Χαιρόμαστε πάντως που είσαι μαζί μας! ', + 'DELETE_MASTER' => 'Δεν μπορείτε να διαγράψετε τον κύριο λογαριασμό!', + 'DELETION_SUCCESSFUL' => 'Ο χρήστης {{user_name}} διαγράφηκε.', + 'DETAILS_UPDATED' => 'Ενημέρωθηκαν οι πληροφορίες λογαριασμού για τον χρήστη {{user_name}}', + 'DISABLE_MASTER' => 'Δεν μπορείτε να απενεργοποιήσετε τον κύριο λογαριασμό!', + 'DISABLE_SELF' => 'Δεν μπορείτε να απενεργοποιήσετε τον δικό σας λογαριασμό!', + 'DISABLE_SUCCESSFUL' => 'Ο λογαριασμός του χρήστη {{user_name}} απενεργοποιήθηκε.', + + 'ENABLE_SUCCESSFUL' => 'Ο λογαριασμός του χρήστη {{user_name}} ενεργοποιήθηκε.', + + 'GROUP' => [ + 1 => 'Ομάδα', + 2 => 'Ομάδες', + + 'CREATE' => 'Δημιουργία ομάδας', + 'CREATION_SUCCESSFUL' => 'Η ομάδα {{name}} δημιουργήθηκε', + 'DELETE' => 'Διαγραφή ομάδας', + 'DELETE_CONFIRM' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε την ομάδα {{name}}?', + 'DELETE_DEFAULT' => 'Δεν μπορείτε να διαγράψετε την ομάδα {{name}} επειδή είναι η προεπιλεγμένη ομάδα για τους νεοεισερχόμενους χρήστες.', + 'DELETE_YES' => 'Ναι, διαγραφή ομάδας', + 'DELETION_SUCCESSFUL' => 'Η ομάδα {{name}} διαγράφηκε', + 'EDIT' => 'Επεξεργασία ομάδας', + 'ICON' => 'Εικονίδιο ομάδας', + 'ICON_EXPLAIN' => 'Εικονίδιο για τα μέλη της ομάδας', + 'INFO_PAGE' => 'Σελίδα πληροφοριών για την ομάδα {{name}}', + 'MANAGE' => 'Διαχείριση ομάδας', + 'NAME' => 'Όνομα ομάδας', + 'NAME_EXPLAIN' => 'Παρακαλώ εισάγετε ένα όνομα για την ομάδα', + 'NOT_EMPTY' => 'Δεν μπορείτε να το κάνετε αυτό επειδή εξακολουθούν να υπάρχουν χρήστες που είναι μέλη της ομάδας {{name}}.', + 'PAGE_DESCRIPTION' => 'Λίστα των ομάδων του ιστότοπού σας. Παρέχει εργαλεία διαχείρισης για την επεξεργασία και τη διαγραφή ομάδων.', + 'SUMMARY' => 'Σύνοψη ομάδας', + 'UPDATE' => 'Ενημερώθηκαν οι λεπτομέρειες της ομάδας {{name}}', ], - "MANUALLY_ACTIVATED" => "Ο λογαριασμός του {{user_name}}'s ενεργοποίηθηκε χειροκίνητα", - "MASTER_ACCOUNT_EXISTS" => "Υπάρχει ήδη ο κύριος λογαριασμός!", - "MIGRATION" => [ - "REQUIRED" => "Απαιτείται ενημέρωση της βάσης δεδομένων" + 'MANUALLY_ACTIVATED' => "Ο λογαριασμός του {{user_name}}'s ενεργοποίηθηκε χειροκίνητα", + 'MASTER_ACCOUNT_EXISTS' => 'Υπάρχει ήδη ο κύριος λογαριασμός!', + 'MIGRATION' => [ + 'REQUIRED' => 'Απαιτείται ενημέρωση της βάσης δεδομένων', ], - "PERMISSION" => [ - 1 => "Δικαίωμα", - 2 => "Δικαιώματα", - - "ASSIGN_NEW" => "Αντιστοίχιση νέου δικαιώματος", - "HOOK_CONDITION" => "Hook/Conditions", - "ID" => "ID δικαιώματος", - "INFO_PAGE" => "Πληροφορίες δικαιώματων για '{{name}}'", - "MANAGE" => "Διαχείριση δικαιώματων", - "NOTE_READ_ONLY" => "Σημείωση: Τα δικαιώματα θεωρούνται ως \"κομμάτι του κώδικα\" και δεν μπορούν να τροποποιηθούν για το interface. Για να προσθέσετε, αφαιρέσετε, ή τροποποιήσετε δικαιώματα , θα πρέπει οι δημιουργοί του ιστότοπου να ακολουθήσουν την διαδικασία database migration.", - "PAGE_DESCRIPTION" => "Λίστα δικαιωμάτων για τον ιστότοπό σας. Παρέχει εργαλεία διαχείρισης για την επεξεργασία και τη διαγραφή των δικαιωμάτων", - "SUMMARY" => "Περίληψη δικαιωμάτος", - "UPDATE" => "Ενημέρωση δικαιωμάτων", - "VIA_ROLES" => "Έχει άδεια βάσει ρόλου" + 'PERMISSION' => [ + 1 => 'Δικαίωμα', + 2 => 'Δικαιώματα', + + 'ASSIGN_NEW' => 'Αντιστοίχιση νέου δικαιώματος', + 'HOOK_CONDITION' => 'Hook/Conditions', + 'ID' => 'ID δικαιώματος', + 'INFO_PAGE' => "Πληροφορίες δικαιώματων για '{{name}}'", + 'MANAGE' => 'Διαχείριση δικαιώματων', + 'NOTE_READ_ONLY' => 'Σημείωση: Τα δικαιώματα θεωρούνται ως "κομμάτι του κώδικα" και δεν μπορούν να τροποποιηθούν για το interface. Για να προσθέσετε, αφαιρέσετε, ή τροποποιήσετε δικαιώματα , θα πρέπει οι δημιουργοί του ιστότοπου να ακολουθήσουν την διαδικασία database migration.', + 'PAGE_DESCRIPTION' => 'Λίστα δικαιωμάτων για τον ιστότοπό σας. Παρέχει εργαλεία διαχείρισης για την επεξεργασία και τη διαγραφή των δικαιωμάτων', + 'SUMMARY' => 'Περίληψη δικαιωμάτος', + 'UPDATE' => 'Ενημέρωση δικαιωμάτων', + 'VIA_ROLES' => 'Έχει άδεια βάσει ρόλου', ], - "ROLE" => [ - 1 => "Ρόλος", - 2 => "Ρόλοι", - - "ASSIGN_NEW" => "Ανάθεση νέου ρόλου", - "CREATE" => "Δημιουργία ρόλου", - "CREATION_SUCCESSFUL" => "Επιτυχής δημιουργία ρόλου {{name}}", - "DELETE" => "Διαγραφή ρόλου", - "DELETE_CONFIRM" => "Είστε βέβαιοι ότι θέλετε να διαγράψετε το ρόλο {{name}}?", - "DELETE_DEFAULT" => "Δεν μπορείτε να διαγράψετε το ρόλο {{name}} επειδή είναι ένας προεπιλεγμένος ρόλος για τους νέους χρήστες.", - "DELETE_YES" => "Ναι, διαγραφή ρόλου", - "DELETION_SUCCESSFUL" => "Ο ρόλος {{name}} διαγράφηκε", - "EDIT" => "Επεξεργασία ρόλου", - "HAS_USERS" => "Δεν μπορείτε να το κάνετε επειδή υπάρχουν ακόμα χρήστες που έχουν τον ρόλο {{name}}.", - "INFO_PAGE" => "Σελίδα πληροφοριών του ρόλου {{name}}", - "MANAGE" => "Διαχείριση ρόλου", - "NAME" => "Όνομα", - "NAME_EXPLAIN" => "Παρακαλώ εισάγετε ένα όνομα για το ρόλο", - "NAME_IN_USE" => "Υπάρχει ήδη ρόλος με όνομα {{name}}", - "PAGE_DESCRIPTION" => "Λίστα των ρόλων για τον ιστότοπό σας.Παρέχει εργαλεία διαχείρισης για επεξεργασία και διαγραφή ρόλων.", - "PERMISSIONS_UPDATED" => "Τα δικαιώματα ενημερώθηκαν για τον ρόλο {{name}}", - "SUMMARY" => "Περίληψη ρόλου", - "UPDATED" => "Οι λεπτομέρειες του ρόλου {{name}} ενημερώθηκαν" + 'ROLE' => [ + 1 => 'Ρόλος', + 2 => 'Ρόλοι', + + 'ASSIGN_NEW' => 'Ανάθεση νέου ρόλου', + 'CREATE' => 'Δημιουργία ρόλου', + 'CREATION_SUCCESSFUL' => 'Επιτυχής δημιουργία ρόλου {{name}}', + 'DELETE' => 'Διαγραφή ρόλου', + 'DELETE_CONFIRM' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε το ρόλο {{name}}?', + 'DELETE_DEFAULT' => 'Δεν μπορείτε να διαγράψετε το ρόλο {{name}} επειδή είναι ένας προεπιλεγμένος ρόλος για τους νέους χρήστες.', + 'DELETE_YES' => 'Ναι, διαγραφή ρόλου', + 'DELETION_SUCCESSFUL' => 'Ο ρόλος {{name}} διαγράφηκε', + 'EDIT' => 'Επεξεργασία ρόλου', + 'HAS_USERS' => 'Δεν μπορείτε να το κάνετε επειδή υπάρχουν ακόμα χρήστες που έχουν τον ρόλο {{name}}.', + 'INFO_PAGE' => 'Σελίδα πληροφοριών του ρόλου {{name}}', + 'MANAGE' => 'Διαχείριση ρόλου', + 'NAME' => 'Όνομα', + 'NAME_EXPLAIN' => 'Παρακαλώ εισάγετε ένα όνομα για το ρόλο', + 'NAME_IN_USE' => 'Υπάρχει ήδη ρόλος με όνομα {{name}}', + 'PAGE_DESCRIPTION' => 'Λίστα των ρόλων για τον ιστότοπό σας.Παρέχει εργαλεία διαχείρισης για επεξεργασία και διαγραφή ρόλων.', + 'PERMISSIONS_UPDATED' => 'Τα δικαιώματα ενημερώθηκαν για τον ρόλο {{name}}', + 'SUMMARY' => 'Περίληψη ρόλου', + 'UPDATED' => 'Οι λεπτομέρειες του ρόλου {{name}} ενημερώθηκαν', ], - "SYSTEM_INFO" => [ - "@TRANSLATION" => "Πληροφορίες συστήματος", - - "DB_NAME" => "Όνομα βάσης δεδομένων", - "DB_VERSION" => "Έκδοση βάσης δεδομένων", - "DIRECTORY" => "Κατάλογος project", - "PHP_VERSION" => "Έκδοση PHP", - "SERVER" => "Λογισμικό διακομιστή Web", - "SPRINKLES" => "Φορτωμένα sprinkles", - "UF_VERSION" => "Έκδοση UserFrosting", - "URL" => "Site root url" + 'SYSTEM_INFO' => [ + '@TRANSLATION' => 'Πληροφορίες συστήματος', + + 'DB_NAME' => 'Όνομα βάσης δεδομένων', + 'DB_VERSION' => 'Έκδοση βάσης δεδομένων', + 'DIRECTORY' => 'Κατάλογος project', + 'PHP_VERSION' => 'Έκδοση PHP', + 'SERVER' => 'Λογισμικό διακομιστή Web', + 'SPRINKLES' => 'Φορτωμένα sprinkles', + 'UF_VERSION' => 'Έκδοση UserFrosting', + 'URL' => 'Site root url', ], - "TOGGLE_COLUMNS" => "Εναλλαγή στηλών", + 'TOGGLE_COLUMNS' => 'Εναλλαγή στηλών', - "USER" => [ - 1 => "Χρήστης", - 2 => "Χρήστες", + 'USER' => [ + 1 => 'Χρήστης', + 2 => 'Χρήστες', - "ADMIN" => [ - "CHANGE_PASSWORD" => "Αλλαγή κωδικού χρήστη", - "SEND_PASSWORD_LINK" => "Αποστολή στον χρήστη ενός συνδέσμου που θα του επιτρέψει να επιλέξει κωδικό πρόσβασης", - "SET_PASSWORD" => "Ορίστε τον κωδικό πρόσβασης του χρήστη ως" + 'ADMIN' => [ + 'CHANGE_PASSWORD' => 'Αλλαγή κωδικού χρήστη', + 'SEND_PASSWORD_LINK' => 'Αποστολή στον χρήστη ενός συνδέσμου που θα του επιτρέψει να επιλέξει κωδικό πρόσβασης', + 'SET_PASSWORD' => 'Ορίστε τον κωδικό πρόσβασης του χρήστη ως', ], - "ACTIVATE" => "Ενεργοποίηση χρήστη", - "CREATE" => "Δημιουργία χρήστη", - "CREATED" => "Ο χρήστης {{user_name}} δημιουργήθηκε", - "DELETE" => "Διαγραφή χρήστη", - "DELETE_CONFIRM" => "Είστε βέβαιοι ότι θέλετε να διαγράψετε τον χρήστη {{name}}?", - "DELETE_YES" => "Ναι, διαγραφή χρήστη", - "DELETED" => "Ο χρήστης διαγράφηκε", - "DISABLE" => "Απενεργοποίηση χρήστη", - "EDIT" => "Επεξεργασία χρήστη", - "ENABLE" => "Ενεργοποίηση χρήστη", - "INFO_PAGE" => "Σελίδα πληροφοριών για τον χρήστη {{name}}", - "LATEST" => "Πρόσφατοι χρήστες", - "PAGE_DESCRIPTION" => "Λίστα χρηστών για τον ιστότοπό σας.Παρέχει εργαλεία διαχείρισης, συμπεριλαμβανομένης της δυνατότητας επεξεργασίας λεπτομερειών χρηστών, χειροκίνητης ενεργοποίησης χρηστών, ενεργοποίησης / απενεργοποίησης χρηστών και πολλών άλλων.", - "SUMMARY" => "Περίληψη λογαριασμού", - "VIEW_ALL" => "Προβολή όλων των χρηστών", - "WITH_PERMISSION" => "Χρήστες με αυτό το δικαιώμα" + 'ACTIVATE' => 'Ενεργοποίηση χρήστη', + 'CREATE' => 'Δημιουργία χρήστη', + 'CREATED' => 'Ο χρήστης {{user_name}} δημιουργήθηκε', + 'DELETE' => 'Διαγραφή χρήστη', + 'DELETE_CONFIRM' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε τον χρήστη {{name}}?', + 'DELETE_YES' => 'Ναι, διαγραφή χρήστη', + 'DELETED' => 'Ο χρήστης διαγράφηκε', + 'DISABLE' => 'Απενεργοποίηση χρήστη', + 'EDIT' => 'Επεξεργασία χρήστη', + 'ENABLE' => 'Ενεργοποίηση χρήστη', + 'INFO_PAGE' => 'Σελίδα πληροφοριών για τον χρήστη {{name}}', + 'LATEST' => 'Πρόσφατοι χρήστες', + 'PAGE_DESCRIPTION' => 'Λίστα χρηστών για τον ιστότοπό σας.Παρέχει εργαλεία διαχείρισης, συμπεριλαμβανομένης της δυνατότητας επεξεργασίας λεπτομερειών χρηστών, χειροκίνητης ενεργοποίησης χρηστών, ενεργοποίησης / απενεργοποίησης χρηστών και πολλών άλλων.', + 'SUMMARY' => 'Περίληψη λογαριασμού', + 'VIEW_ALL' => 'Προβολή όλων των χρηστών', + 'WITH_PERMISSION' => 'Χρήστες με αυτό το δικαιώμα', + ], + 'X_USER' => [ + 0 => 'No χρήστες', + 1 => '{{plural}} χρήστης', + 2 => '{{plural}} χρήστες', ], - "X_USER" => [ - 0 => "No χρήστες", - 1 => "{{plural}} χρήστης", - 2 => "{{plural}} χρήστες" - ] ]; diff --git a/app/sprinkles/admin/locale/en_US/messages.php b/app/sprinkles/admin/locale/en_US/messages.php index b36fa3fac..ffed268a1 100644 --- a/app/sprinkles/admin/locale/en_US/messages.php +++ b/app/sprinkles/admin/locale/en_US/messages.php @@ -1,5 +1,6 @@ 'Last Activity', 'PAGE' => 'A listing of user activities', - 'TIME' => 'Activity Time' + 'TIME' => 'Activity Time', ], 'CACHE' => [ 'CLEAR' => 'Clear cache', 'CLEAR_CONFIRM' => 'Are you sure you want to clear the site cache?', 'CLEAR_CONFIRM_YES' => 'Yes, clear cache', - 'CLEARED' => 'Cache cleared successfully !' + 'CLEARED' => 'Cache cleared successfully !', ], 'DASHBOARD' => 'Dashboard', @@ -61,13 +62,13 @@ 'NOT_EMPTY' => "You can't do that because there are still users associated with the group {{name}}.", 'PAGE_DESCRIPTION' => 'A listing of the groups for your site. Provides management tools for editing and deleting groups.', 'SUMMARY' => 'Group Summary', - 'UPDATE' => 'Details updated for group {{name}}' + 'UPDATE' => 'Details updated for group {{name}}', ], 'MANUALLY_ACTIVATED' => "{{user_name}}'s account has been manually activated", 'MASTER_ACCOUNT_EXISTS' => 'The master account already exists!', 'MIGRATION' => [ - 'REQUIRED' => 'Database update required' + 'REQUIRED' => 'Database update required', ], 'PERMISSION' => [ @@ -83,7 +84,7 @@ 'PAGE_DESCRIPTION' => 'A listing of the permissions for your site. Provides management tools for editing and deleting permissions.', 'SUMMARY' => 'Permission Summary', 'UPDATE' => 'Update permissions', - 'VIA_ROLES' => 'Has permission via roles' + 'VIA_ROLES' => 'Has permission via roles', ], 'ROLE' => [ @@ -108,7 +109,7 @@ 'PAGE_DESCRIPTION' => 'A listing of the roles for your site. Provides management tools for editing and deleting roles.', 'PERMISSIONS_UPDATED' => 'Permissions updated for role {{name}}', 'SUMMARY' => 'Role Summary', - 'UPDATED' => 'Details updated for role {{name}}' + 'UPDATED' => 'Details updated for role {{name}}', ], 'SYSTEM_INFO' => [ @@ -121,7 +122,7 @@ 'SERVER' => 'Webserver software', 'SPRINKLES' => 'Loaded sprinkles', 'UF_VERSION' => 'UserFrosting version', - 'URL' => 'Site root url' + 'URL' => 'Site root url', ], 'TOGGLE_COLUMNS' => 'Toggle columns', @@ -133,7 +134,7 @@ 'ADMIN' => [ 'CHANGE_PASSWORD' => 'Change User Password', 'SEND_PASSWORD_LINK' => 'Send the user a link that will allow them to choose their own password', - 'SET_PASSWORD' => "Set the user's password as" + 'SET_PASSWORD' => "Set the user's password as", ], 'ACTIVATE' => 'Activate user', @@ -151,11 +152,11 @@ 'PAGE_DESCRIPTION' => 'A listing of the users for your site. Provides management tools including the ability to edit user details, manually activate users, enable/disable users, and more.', 'SUMMARY' => 'Account Summary', 'VIEW_ALL' => 'View all users', - 'WITH_PERMISSION' => 'Users with this permission' + 'WITH_PERMISSION' => 'Users with this permission', ], 'X_USER' => [ 0 => 'No users', 1 => '{{plural}} user', - 2 => '{{plural}} users' - ] + 2 => '{{plural}} users', + ], ]; diff --git a/app/sprinkles/admin/locale/es_ES/messages.php b/app/sprinkles/admin/locale/es_ES/messages.php index c62c408e8..318fc1dcb 100755 --- a/app/sprinkles/admin/locale/es_ES/messages.php +++ b/app/sprinkles/admin/locale/es_ES/messages.php @@ -1,5 +1,6 @@ 'Última actividad', 'PAGE' => 'Una lista de las actividades del usuario', - 'TIME' => 'Tiempo de Actividad' + 'TIME' => 'Tiempo de Actividad', ], 'ADMIN' => [ - 'PANEL' => 'Panel de administración' + 'PANEL' => 'Panel de administración', ], 'CACHE' => [ 'CLEAR' => 'Limpiar cache', 'CLEAR_CONFIRM' => '¿Estás seguro de que deseas borrar la caché del sitio?', 'CLEAR_CONFIRM_YES' => 'Sí, borrar caché', - 'CLEARED' => '¡Cache borrado correctamente!' + 'CLEARED' => '¡Cache borrado correctamente!', ], 'DASHBOARD' => 'Tablero', @@ -65,13 +66,13 @@ 'NOT_EMPTY' => 'No puedes hacerlo porque todavía hay usuarios asociados con el grupo {{name}} .', 'PAGE_DESCRIPTION' => 'Un listado de los grupos para tu sitio. Proporciona herramientas de administración para editar y eliminar grupos.', 'SUMMARY' => 'Resumen del grupo', - 'UPDATE' => 'Detalles actualizados para el grupo {{name}} ' + 'UPDATE' => 'Detalles actualizados para el grupo {{name}} ', ], 'MANUALLY_ACTIVATED' => 'La cuenta de {{user_name}} se ha activado manualmente', 'MASTER_ACCOUNT_EXISTS' => '¡La cuenta maestra ya existe!', 'MIGRATION' => [ - 'REQUIRED' => 'Se requiere actualizar la base de datos' + 'REQUIRED' => 'Se requiere actualizar la base de datos', ], 'PERMISSION' => [ @@ -87,7 +88,7 @@ 'PAGE_DESCRIPTION' => 'Una lista de los permisos para tu sitio. Proporciona herramientas de administración para editar y eliminar permisos.', 'SUMMARY' => 'Resumen del permiso', 'UPDATE' => 'Actualizar permisos', - 'VIA_ROLES' => 'Tiene permiso para los roles' + 'VIA_ROLES' => 'Tiene permiso para los roles', ], 'ROLE' => [ @@ -112,7 +113,7 @@ 'PAGE_DESCRIPTION' => 'Una lista de las funciones de tu sitio. Proporciona herramientas de administración para editar y eliminar roles.', 'PERMISSIONS_UPDATED' => 'Permisos actualizados para el rol {{name}} ', 'SUMMARY' => 'Resumen del rol', - 'UPDATED' => 'Detalles actualizados para el rol {{name}} ' + 'UPDATED' => 'Detalles actualizados para el rol {{name}} ', ], 'SYSTEM_INFO' => [ @@ -125,7 +126,7 @@ 'SERVER' => 'Software de servidor Web', 'SPRINKLES' => 'Sprinkles cargados', 'UF_VERSION' => 'UserFrosting versión', - 'URL' => 'URL root del sitio' + 'URL' => 'URL root del sitio', ], 'TOGGLE_COLUMNS' => 'Alternar columnas', @@ -138,7 +139,7 @@ 'ADMIN' => [ 'CHANGE_PASSWORD' => 'Cambiar contraseña de usuario', 'SEND_PASSWORD_LINK' => 'Enviar al usuario un enlace que les permita elegir su propia contraseña', - 'SET_PASSWORD' => 'Establece la contraseña del usuario como' + 'SET_PASSWORD' => 'Establece la contraseña del usuario como', ], 'ACTIVATE' => 'Activar usuario', @@ -155,11 +156,11 @@ 'PAGE_DESCRIPTION' => 'Una lista de los usuarios para tu sitio. Proporciona herramientas de administración que incluyen la capacidad de editar detalles de usuario, activar manualmente usuarios, habilitar / deshabilitar usuarios y más.', 'SUMMARY' => 'Resumen de la cuenta', 'VIEW_ALL' => 'Ver todos los usuarios', - 'WITH_PERMISSION' => 'Usuarios con este permiso' + 'WITH_PERMISSION' => 'Usuarios con este permiso', ], 'X_USER' => [ 0 => 'No hay usuarios', 1 => '{{plural}} usuario', - 2 => '{{plural}} usuarios' - ] + 2 => '{{plural}} usuarios', + ], ]; diff --git a/app/sprinkles/admin/locale/fa/messages.php b/app/sprinkles/admin/locale/fa/messages.php index 5a38ad65c..729b5b360 100644 --- a/app/sprinkles/admin/locale/fa/messages.php +++ b/app/sprinkles/admin/locale/fa/messages.php @@ -1,5 +1,6 @@ 'آخرین فعالیت', 'PAGE' => 'لیستی از فعالیت های کاربر', - 'TIME' => 'زمان فعالیت' + 'TIME' => 'زمان فعالیت', ], 'CACHE' => [ 'CLEAR' => 'پاک سازی کش', 'CLEAR_CONFIRM' => 'آیا مطمئن هستید که میخواهید کش سایت را پاک سازی کنید؟', 'CLEAR_CONFIRM_YES' => 'بله، کش پاک سازی شود', - 'CLEARED' => 'کش با موفقیت پاک سازی شد' + 'CLEARED' => 'کش با موفقیت پاک سازی شد', ], 'DASHBOARD' => 'کارتابل', @@ -59,13 +60,13 @@ 'NOT_EMPTY' => 'نمیتوان این کار را کرد چون هنوز کاربرانی عضو گروه {{name}} هستند.', 'PAGE_DESCRIPTION' => 'لیست گروه های وب سایت شما. امکان مدیریت این گروه ها در این صفحه وجود دارد.', 'SUMMARY' => 'توضیحات گروه', - 'UPDATE' => 'اطلاعات گروه {{name}} به روز رسانی شد.' + 'UPDATE' => 'اطلاعات گروه {{name}} به روز رسانی شد.', ], 'MANUALLY_ACTIVATED' => 'حساب کاربری {{user_name}} بصورت دستی فعال شد.', 'MASTER_ACCOUNT_EXISTS' => 'حساب کاربری اصلی وجود دارد!', 'MIGRATION' => [ - 'REQUIRED' => 'به روز رسانی پایگاه داده ها باید انجام شود' + 'REQUIRED' => 'به روز رسانی پایگاه داده ها باید انجام شود', ], 'PERMISSION' => [ @@ -81,7 +82,7 @@ 'PAGE_DESCRIPTION' => 'لیست دسترسی های وب سایت شما. امکان مدیریت این دسترسی ها در این صفحه وجود دارد.', 'SUMMARY' => 'توضیحات دسترسی ها', 'UPDATE' => 'به روز رسانی دسترسی ها', - 'VIA_ROLES' => 'از طریق وظیفه ها دسترسی دارد' + 'VIA_ROLES' => 'از طریق وظیفه ها دسترسی دارد', ], 'ROLE' => [ @@ -106,7 +107,7 @@ 'PAGE_DESCRIPTION' => 'لیست وظیفه های وب سایت شما. امکان مدیریت این وظیفه ها در این صفحه وجود دارد.', 'PERMISSIONS_UPDATED' => 'دسترسی ها برای وظیفه {{name}} به روز رسانی شد', 'SUMMARY' => 'خلاصه وظیفه', - 'UPDATED' => 'اطلاعات وظیفه {{name}} به روز رسانی شد' + 'UPDATED' => 'اطلاعات وظیفه {{name}} به روز رسانی شد', ], 'SYSTEM_INFO' => [ @@ -119,7 +120,7 @@ 'SERVER' => 'نرمافزار وب سرور', 'SPRINKLES' => 'اسپرینکل های بارگذاری شده', 'UF_VERSION' => 'نسخه یوزرفروستینگ', - 'URL' => 'آدرس رووت وب سایت' + 'URL' => 'آدرس رووت وب سایت', ], 'TOGGLE_COLUMNS' => 'تغییر ستون', @@ -131,7 +132,7 @@ 'ADMIN' => [ 'CHANGE_PASSWORD' => 'تغییر گذرواژه کاربر', 'SEND_PASSWORD_LINK' => 'برای کاربر ایمیلی ارسال شود تا گذرواژه خود را تغییر دهد', - 'SET_PASSWORD' => 'گذرواژه کاربر را انتخاب کنید' + 'SET_PASSWORD' => 'گذرواژه کاربر را انتخاب کنید', ], 'ACTIVATE' => 'کاربر فعال', @@ -148,11 +149,11 @@ 'PAGE_DESCRIPTION' => 'لیستی از کاربران سایت. این صفحه به شما امکان ویرایش، فعال سازی و غیر فعال سازی کاربران را می دهد.', 'SUMMARY' => 'خلاصه حساب', 'VIEW_ALL' => 'تماشای همه ی کاربران', - 'WITH_PERMISSION' => 'کاربرانی که این دسترسی را دارند' + 'WITH_PERMISSION' => 'کاربرانی که این دسترسی را دارند', ], 'X_USER' => [ 0 => 'هیچ کاربری', 1 => '{{plural}} کاربر', - 2 => '{{plural}} کاربر' - ] + 2 => '{{plural}} کاربر', + ], ]; diff --git a/app/sprinkles/admin/locale/fr_FR/messages.php b/app/sprinkles/admin/locale/fr_FR/messages.php index 6833da354..520abfe8c 100644 --- a/app/sprinkles/admin/locale/fr_FR/messages.php +++ b/app/sprinkles/admin/locale/fr_FR/messages.php @@ -1,5 +1,6 @@ 'Dernière activité', 'PAGE' => 'Une liste des activités des utilisateurs', - 'TIME' => "Date de l'activité" + 'TIME' => "Date de l'activité", ], 'CACHE' => [ 'CLEAR' => 'Vider le cache', 'CLEAR_CONFIRM' => 'Voulez-vous vraiment supprimer le cache du site?', 'CLEAR_CONFIRM_YES' => 'Oui, vider le cache', - 'CLEARED' => 'Cache effacé avec succès !' + 'CLEARED' => 'Cache effacé avec succès !', ], 'DASHBOARD' => 'Tableau de bord', @@ -60,13 +61,13 @@ 'NAME_EXPLAIN' => 'Spécifiez le nom du groupe', 'NOT_EMPTY' => 'Vous ne pouvez pas le faire car il y a encore des utilisateurs associés au groupe {{name}}.', 'PAGE_DESCRIPTION' => 'Une liste des groupes pour votre site. Fournit des outils de gestion pour éditer et supprimer des groupes.', - 'UPDATE' => 'Les détails du groupe {{name}} ont été enregistrés' + 'UPDATE' => 'Les détails du groupe {{name}} ont été enregistrés', ], 'MANUALLY_ACTIVATED' => 'Le compte de {{user_name}} a été activé manuellement', 'MASTER_ACCOUNT_EXISTS' => 'Le compte principal existe déjà !', 'MIGRATION' => [ - 'REQUIRED' => 'Mise à jour de la base de données requise' + 'REQUIRED' => 'Mise à jour de la base de données requise', ], 'PERMISSION' => [ @@ -77,7 +78,7 @@ 'HOOK_CONDITION' => 'Hook/Conditions', 'MANAGE' => 'Gestion des autorisations', 'PAGE_DESCRIPTION' => 'Une liste des autorisations pour votre site. Fournit des outils de gestion pour modifier et supprimer des autorisations.', - 'UPDATE' => 'Mettre à jour les autorisations' + 'UPDATE' => 'Mettre à jour les autorisations', ], 'ROLE' => [ @@ -101,7 +102,7 @@ 'NAME_IN_USE' => 'Un rôle nommé {{name}} existe déjà', 'PAGE_DESCRIPTION' => 'Une liste des rôles de votre site. Fournit des outils de gestion pour modifier et supprimer des rôles.', 'PERMISSIONS_UPDATED' => 'Autorisations mises à jour pour le rôle {{name}}', - 'UPDATED' => 'Détails mis à jour pour le rôle {{name}}' + 'UPDATED' => 'Détails mis à jour pour le rôle {{name}}', ], 'SYSTEM_INFO' => [ @@ -114,7 +115,7 @@ 'SERVER' => 'Logiciel server', 'SPRINKLES' => 'Sprinkles chargés', 'UF_VERSION' => 'Version de UserFrosting', - 'URL' => 'Url racine' + 'URL' => 'Url racine', ], 'USER' => [ @@ -124,7 +125,7 @@ 'ADMIN' => [ 'CHANGE_PASSWORD' => 'Changer le mot de passe', 'SEND_PASSWORD_LINK' => "Envoyer à l'utilisateur un lien qui lui permettra de choisir son propre mot de passe", - 'SET_PASSWORD' => "Définissez le mot de passe de l'utilisateur comme" + 'SET_PASSWORD' => "Définissez le mot de passe de l'utilisateur comme", ], 'ACTIVATE' => "Autoriser l'utilisateur", @@ -139,11 +140,11 @@ 'INFO_PAGE' => "Page d'information de l'utilisateur pour {{name}}", 'PAGE_DESCRIPTION' => "Une liste des utilisateurs de votre site. Fournit des outils de gestion incluant la possibilité de modifier les détails de l'utilisateur, d'activer manuellement les utilisateurs, d'activer / désactiver les utilisateurs et plus.", 'LATEST' => 'Derniers utilisateurs', - 'VIEW_ALL' => 'Voir tous les utilisateurs' + 'VIEW_ALL' => 'Voir tous les utilisateurs', ], 'X_USER' => [ 0 => 'Aucun utilisateur', 1 => '{{plural}} utilisateur', - 2 => '{{plural}} utilisateurs' - ] + 2 => '{{plural}} utilisateurs', + ], ]; diff --git a/app/sprinkles/admin/locale/it_IT/messages.php b/app/sprinkles/admin/locale/it_IT/messages.php index 413ba36e1..84d7c72ea 100644 --- a/app/sprinkles/admin/locale/it_IT/messages.php +++ b/app/sprinkles/admin/locale/it_IT/messages.php @@ -1,5 +1,6 @@ 'Ultima attività', 'PAGE' => 'Un elenco delle attività degli utenti', - 'TIME' => 'Tempo di attività' + 'TIME' => 'Tempo di attività', ], 'CACHE' => [ 'CLEAR' => 'Elimina cache', 'CLEAR_CONFIRM' => 'Sei sicuro di voler eliminare la cache del sito?', 'CLEAR_CONFIRM_YES' => 'Sì, elimina la cache', - 'CLEARED' => 'La cache è stata eliminata correttamente!' + 'CLEARED' => 'La cache è stata eliminata correttamente!', ], 'DASHBOARD' => 'Pannello di Controllo', @@ -62,13 +63,13 @@ 'NOT_EMPTY' => 'Non puoi farlo perché ci sono ancora utenti associati al gruppo {{name}}.', 'PAGE_DESCRIPTION' => "Un elenco dei gruppi per il tuo sito. Fornisce strumenti di gestione per la modifica e l'eliminazione di gruppi.", 'SUMMARY' => 'Riepilogo Gruppo', - 'UPDATE' => 'Dettagli del gruppo {{name}} aggiornati.' + 'UPDATE' => 'Dettagli del gruppo {{name}} aggiornati.', ], 'MANUALLY_ACTIVATED' => '{{user_name}} è stato attivato manualmente', 'MASTER_ACCOUNT_EXISTS' => "L'account primario esiste già!", 'MIGRATION' => [ - 'REQUIRED' => 'È necessario aggiornare il database' + 'REQUIRED' => 'È necessario aggiornare il database', ], 'PERMISSION' => [ @@ -84,7 +85,7 @@ 'PAGE_DESCRIPTION' => "Un elenco delle autorizzazioni per il tuo sito. Fornisce strumenti di gestione per la modifica e l'eliminazione delle autorizzazioni.", 'SUMMARY' => 'Sommario autorizzazioni', 'UPDATE' => 'Aggiorna autorizzazioni', - 'VIA_ROLES' => 'Ha i permessi tramite i ruoli' + 'VIA_ROLES' => 'Ha i permessi tramite i ruoli', ], 'ROLE' => [ @@ -109,7 +110,7 @@ 'PAGE_DESCRIPTION' => "Un elenco dei ruoli per il tuo sito. Fornisce strumenti di gestione per la modifica e l'eliminazione di ruoli.", 'PERMISSIONS_UPDATED' => 'Autorizzazioni aggiornate per il ruolo {{name}}', 'SUMMARY' => 'Riepilogo dei Ruoli', - 'UPDATED' => 'Dettagli aggiornati per il ruolo {{name}}' + 'UPDATED' => 'Dettagli aggiornati per il ruolo {{name}}', ], 'SYSTEM_INFO' => [ @@ -122,7 +123,7 @@ 'SERVER' => 'Software Webserver', 'SPRINKLES' => 'Sprinkles caricati', 'UF_VERSION' => 'Versione UserFrosting', - 'URL' => 'Url della root del sito' + 'URL' => 'Url della root del sito', ], 'TOGGLE_COLUMNS' => 'Scambia le colonne', @@ -134,7 +135,7 @@ 'ADMIN' => [ 'CHANGE_PASSWORD' => 'Cambia password utente', 'SEND_PASSWORD_LINK' => "Invia all'utente un link che gli permetterà di scegliere una nuova password.", - 'SET_PASSWORD' => "Impostare la password dell'utente come" + 'SET_PASSWORD' => "Impostare la password dell'utente come", ], 'ACTIVATE' => 'Attiva utente', @@ -151,11 +152,11 @@ 'PAGE_DESCRIPTION' => 'Un elenco degli utenti del tuo sito. Fornisce strumenti di gestione, tra cui la possibilità di modificare i dettagli utente, attivare manualmente gli utenti, abilitare / disabilitare gli utenti e altro ancora.', 'SUMMARY' => 'Riepilogo account', 'VIEW_ALL' => 'Visualizza tutti gli utenti', - 'WITH_PERMISSION' => 'Utenti con questa autorizzazione' + 'WITH_PERMISSION' => 'Utenti con questa autorizzazione', ], 'X_USER' => [ 0 => 'Nessun utente', 1 => '{{plural}} utente', - 2 => '{{plural}} utenti' - ] + 2 => '{{plural}} utenti', + ], ]; diff --git a/app/sprinkles/admin/locale/pt_PT/messages.php b/app/sprinkles/admin/locale/pt_PT/messages.php index aa1799059..50cee2aab 100644 --- a/app/sprinkles/admin/locale/pt_PT/messages.php +++ b/app/sprinkles/admin/locale/pt_PT/messages.php @@ -1,5 +1,6 @@ 'Última atividade', 'PAGE' => 'Lista de atividade dos utilizadores', - 'TIME' => 'Tempo da Atividade' + 'TIME' => 'Tempo da Atividade', ], 'CACHE' => [ 'CLEAR' => 'Limpar cache', 'CLEAR_CONFIRM' => 'Tem a certeza que pretende limpar a cache do site?', 'CLEAR_CONFIRM_YES' => 'Sim, limpar cache', - 'CLEARED' => 'Cache limpa com sucesso!' + 'CLEARED' => 'Cache limpa com sucesso!', ], 'DASHBOARD' => 'Painel de Controlo', @@ -55,13 +56,13 @@ //"MANAGE" => "Manage group", 'NAME' => 'Nome do grupo', 'NAME_EXPLAIN' => 'Por favor introduza um nome para o grupo', - 'PAGE_DESCRIPTION' => 'Lista de grupos do site. Contém opções para editar e remover grupos.' + 'PAGE_DESCRIPTION' => 'Lista de grupos do site. Contém opções para editar e remover grupos.', ], 'MANUALLY_ACTIVATED' => 'A conta de {{user_name}} foi ativada manualmente.', 'MASTER_ACCOUNT_EXISTS' => 'A contra principal já existe!', 'MIGRATION' => [ - 'REQUIRED' => 'É necessário uma atualização da base de dados.' + 'REQUIRED' => 'É necessário uma atualização da base de dados.', ], 'PERMISSION' => [ @@ -72,7 +73,7 @@ 'HOOK_CONDITION' => 'Hook/Condições', 'MANAGE' => 'Gerir permissões', 'PAGE_DESCRIPTION' => 'Lista de permissões do site. Contém opções para editar e remover permissões.', - 'UPDATE' => 'Atualizar permissões' + 'UPDATE' => 'Atualizar permissões', ], 'ROLE' => [ @@ -93,7 +94,7 @@ 'NAME_EXPLAIN' => 'Por favor introduza um nome para o cargo', 'PAGE_DESCRIPTION' => 'Lista de cargos do site. Contém opções para editar e remover cargos.', 'UPDATE' => 'Atualizar cargos', - 'UPDATED' => 'Cargo {{name}} atualizado' + 'UPDATED' => 'Cargo {{name}} atualizado', ], 'SYSTEM_INFO' => [ @@ -106,7 +107,7 @@ 'SERVER' => 'Software do servidor web', 'SPRINKLES' => 'Sprinkles carregados', 'UF_VERSION' => 'Versão do UserFrosting', - 'URL' => 'Raiz (url) do site' + 'URL' => 'Raiz (url) do site', ], 'USER' => [ @@ -116,7 +117,7 @@ 'ADMIN' => [ 'CHANGE_PASSWORD' => 'Alterar password', 'SEND_PASSWORD_LINK' => 'Enviar um link ao utilizador que lhe permita escolher a sua password', - 'SET_PASSWORD' => 'Definir a password do utilizador como' + 'SET_PASSWORD' => 'Definir a password do utilizador como', ], 'ACTIVATE' => 'Ativar utilizador', @@ -130,11 +131,11 @@ 'INFO_PAGE' => 'Página informativa do utilizador {{name}}', 'PAGE_DESCRIPTION' => 'Lista de utilizadores do site. Contém opções para editar detalhes, ativar/desativar utilizadores e outras.', 'LATEST' => 'Últimos Utilizadores', - 'VIEW_ALL' => 'Ver todos os utilizadores' + 'VIEW_ALL' => 'Ver todos os utilizadores', ], 'X_USER' => [ 0 => 'Nenhum utilizador', 1 => '{{plural}} utilizador', - 2 => '{{plural}} utilizadores' - ] + 2 => '{{plural}} utilizadores', + ], ]; diff --git a/app/sprinkles/admin/locale/ru_RU/messages.php b/app/sprinkles/admin/locale/ru_RU/messages.php index 6169cce38..55d327041 100644 --- a/app/sprinkles/admin/locale/ru_RU/messages.php +++ b/app/sprinkles/admin/locale/ru_RU/messages.php @@ -1,5 +1,6 @@ 'Последняя активность', 'PAGE' => 'Список действий пользователя', - 'TIME' => 'Время действия' + 'TIME' => 'Время действия', ], 'CACHE' => [ 'CLEAR' => 'Очистить кэш', 'CLEAR_CONFIRM' => 'Уверены, что хотите очистить кэш сайта?', 'CLEAR_CONFIRM_YES' => 'Да, очистить кэш', - 'CLEARED' => 'Кэш успешно очищен !' + 'CLEARED' => 'Кэш успешно очищен !', ], 'DASHBOARD' => 'Панель управления', @@ -61,13 +62,13 @@ 'NOT_EMPTY' => 'Вы не можете сделать это, потому что до сих пор есть пользователи, связанные с группой {{name}}.', 'PAGE_DESCRIPTION' => 'Список групп для вашего сайта. Предоставляет инструменты управления для редактирования и удаления групп.', 'SUMMARY' => 'Резюме группы', - 'UPDATE' => 'Информация обновлена для группы {{name}}' + 'UPDATE' => 'Информация обновлена для группы {{name}}', ], 'MANUALLY_ACTIVATED' => '{{user_name}} аккаунт был активирован вручную', 'MASTER_ACCOUNT_EXISTS' => 'Мастер-аккаунт уже существует!', 'MIGRATION' => [ - 'REQUIRED' => 'Необходимо обновление базы данных' + 'REQUIRED' => 'Необходимо обновление базы данных', ], 'PERMISSION' => [ @@ -83,7 +84,7 @@ 'PAGE_DESCRIPTION' => 'Список прав доступа для вашего сайта. Предоставляет инструменты управления для редактирования и удаления прав.', 'SUMMARY' => 'Сводка доступов', 'UPDATE' => 'Обновление прав', - 'VIA_ROLES' => 'Имеет права через роли' + 'VIA_ROLES' => 'Имеет права через роли', ], 'ROLE' => [ @@ -108,7 +109,7 @@ 'PAGE_DESCRIPTION' => 'Список ролей для вашего сайта. Предоставляет инструменты управления для редактирования и удаления ролей.', 'PERMISSIONS_UPDATED' => 'Права обновлены для роли {{name}}', 'SUMMARY' => 'Основная информация', - 'UPDATED' => 'Информация для роли {{name}}' + 'UPDATED' => 'Информация для роли {{name}}', ], 'SYSTEM_INFO' => [ @@ -121,7 +122,7 @@ 'SERVER' => 'ПО Сервера', 'SPRINKLES' => 'Загружены модули', 'UF_VERSION' => 'Версия UserFrosting', - 'URL' => 'URL-адрес сайта' + 'URL' => 'URL-адрес сайта', ], 'TOGGLE_COLUMNS' => 'Переключатель столбцов', @@ -133,7 +134,7 @@ 'ADMIN' => [ 'CHANGE_PASSWORD' => 'Сменить пароль пользователя', 'SEND_PASSWORD_LINK' => 'Отправить пользователю ссылку, которая позволит выбрать свой собственный пароль', - 'SET_PASSWORD' => 'Установите пароль пользователя как' + 'SET_PASSWORD' => 'Установите пароль пользователя как', ], 'ACTIVATE' => 'Активировать пользователя', @@ -151,11 +152,11 @@ 'PAGE_DESCRIPTION' => 'Список пользователей для вашего сайта. Предоставляет средства управления, включая возможность редактирования сведений о пользователях, ручной активации пользователей, включения/отключения пользователей и многое другое.', 'SUMMARY' => 'Сводка аккаунта', 'VIEW_ALL' => 'Все пользователи', - 'WITH_PERMISSION' => 'Пользователи с этим доступом' + 'WITH_PERMISSION' => 'Пользователи с этим доступом', ], 'X_USER' => [ 0 => 'Нет пользователей', 1 => '{{plural}} пользователя', - 2 => '{{plural}} пользователей' - ] + 2 => '{{plural}} пользователей', + ], ]; diff --git a/app/sprinkles/admin/locale/th_TH/messages.php b/app/sprinkles/admin/locale/th_TH/messages.php index e5b0c950d..f49eb535b 100644 --- a/app/sprinkles/admin/locale/th_TH/messages.php +++ b/app/sprinkles/admin/locale/th_TH/messages.php @@ -1,5 +1,6 @@ 'กิจกรรมล่าสุด', 'PAGE' => 'รายการกิจกรรมของผู้ใช้', - 'TIME' => 'เวลาที่ทำกิจกรรม' + 'TIME' => 'เวลาที่ทำกิจกรรม', ], 'CACHE' => [ 'CLEAR' => 'ล้างแคช', 'CLEAR_CONFIRM' => 'คุณแน่ใจหรือที่จะล้างแคชของเว็บ?', 'CLEAR_CONFIRM_YES' => 'ใช่ ล้างแคชเลย', - 'CLEARED' => 'ล้างแคชเรียบร้อยแล้ว!' + 'CLEARED' => 'ล้างแคชเรียบร้อยแล้ว!', ], 'DASHBOARD' => 'แผงควบคุม', @@ -53,13 +54,13 @@ //"MANAGE" => "Manage group", 'NAME' => 'ชื่อกลุ่ม', 'NAME_EXPLAIN' => 'กรุณาตั้งชื่อสำหรับกลุ่มนี้', - 'PAGE_DESCRIPTION' => 'รายชื่อกลุ่มในเว็บของคุณ ประกอบไปด้วยเครื่องมือในการจัดการสำหรับการแก้ไขและลบกลุ่ม' + 'PAGE_DESCRIPTION' => 'รายชื่อกลุ่มในเว็บของคุณ ประกอบไปด้วยเครื่องมือในการจัดการสำหรับการแก้ไขและลบกลุ่ม', ], 'MANUALLY_ACTIVATED' => 'บัญชีของ {{user_name}} ได้เปิดใช้งานเองแล้ว', 'MASTER_ACCOUNT_EXISTS' => 'มีบัญชีหลักอยู่แล้ว!', 'MIGRATION' => [ - 'REQUIRED' => 'ต้องการการปรับปรุงฐานข้อมูล' + 'REQUIRED' => 'ต้องการการปรับปรุงฐานข้อมูล', ], 'PERMISSION' => [ @@ -70,7 +71,7 @@ 'HOOK_CONDITION' => 'ข้อกำหนด/เงื่อนไข', 'MANAGE' => 'จัดการสิทธิการเข้าถึง', 'PAGE_DESCRIPTION' => 'รายการสิทธิการเข้าถึงในเว็บของคุณ ประกอบไปด้วยเครื่องมือในการจัดการสำหรับการแก้ไขและลบสิทธิการเข้าถึง', - 'UPDATE' => 'ปรับปรุงสิทธิการเข้าถึง' + 'UPDATE' => 'ปรับปรุงสิทธิการเข้าถึง', ], 'ROLE' => [ @@ -88,7 +89,7 @@ 'NAME' => 'ชื่อ', 'NAME_EXPLAIN' => 'กรุณาตั้งชื่อสำหรับตำแหน่งนี้', 'PAGE_DESCRIPTION' => 'รายชื่อตำแหน่งในเว็บของคุณ ประกอบไปด้วยเครื่องมือในการจัดการสำหรับแก้ไขและลบตำแหน่ง', - 'UPDATED' => 'ปรับปรุงตำแหน่ง' + 'UPDATED' => 'ปรับปรุงตำแหน่ง', ], 'SYSTEM_INFO' => [ @@ -101,7 +102,7 @@ 'SERVER' => 'ซอฟต์แวร์เว็บเซิร์ฟเวอร์', 'SPRINKLES' => 'Sprinkles ที่ถูกโหลด', 'UF_VERSION' => 'เวอร์ชั่น UserFrosting', - 'URL' => 'URL ของรากเว็บไซต์' + 'URL' => 'URL ของรากเว็บไซต์', ], 'USER' => [ @@ -111,7 +112,7 @@ 'ADMIN' => [ 'CHANGE_PASSWORD' => 'เปลี่ยนรหัสผ่านผู้ใช้', 'SEND_PASSWORD_LINK' => 'ส่งลิงก์ที่จะอนุญาตให้ผู้ใช้เลือกรหัสผ่านเองให้กับผู้ใช้', - 'SET_PASSWORD' => 'ตั้งรหัสผ่านของผู้ใช้เป็น' + 'SET_PASSWORD' => 'ตั้งรหัสผ่านของผู้ใช้เป็น', ], 'ACTIVATE' => 'เปิดใช้งานผู้ใช้', @@ -125,11 +126,11 @@ 'INFO_PAGE' => 'หน้าข้อมูลของผู้ใช้ {{name}}', 'PAGE_DESCRIPTION' => 'รายชื่อผู้ใช้ในเว็บของคุณ ประกอบไปด้วยเครื่องมือสำหรับการจัดการ รวมทั้งความสามารถในการแก้ไขรายละเอียดผู้ใช้ การเปิดใช้งานผู้ใช้ การเปิด/ปิดบัญชีผู้ใช้และอื่น ๆ', 'LATEST' => 'ผู้ใช้ล่าสุด', - 'VIEW_ALL' => 'ดูผู้ใช้ทั้งหมด' + 'VIEW_ALL' => 'ดูผู้ใช้ทั้งหมด', ], 'X_USER' => [ 0 => 'ไม่มีผู้ใช้', 1 => '{{plural}} ผู้ใช้', - 2 => '{{plural}} ผู้ใช้' - ] + 2 => '{{plural}} ผู้ใช้', + ], ]; diff --git a/app/sprinkles/admin/locale/tr/messages.php b/app/sprinkles/admin/locale/tr/messages.php index 5d4a455e6..5a56341be 100644 --- a/app/sprinkles/admin/locale/tr/messages.php +++ b/app/sprinkles/admin/locale/tr/messages.php @@ -1,5 +1,6 @@ 'Son Etkinlik', 'PAGE' => 'Kullanıcı etkinliklerinin listesi', - 'TIME' => 'Aktivite zamanı' + 'TIME' => 'Aktivite zamanı', ], 'CACHE' => [ 'CLEAR' => 'Önbelleği temizle', 'CLEAR_CONFIRM' => 'Site önbelleğini temizlemek istediğine emin misin?', 'CLEAR_CONFIRM_YES' => 'Evet, önbelleği temizle', - 'CLEARED' => 'Önbellek temizlenmesi başarıyla tamamlandı!' + 'CLEARED' => 'Önbellek temizlenmesi başarıyla tamamlandı!', ], 'DASHBOARD' => 'Pano', @@ -61,13 +62,13 @@ 'NOT_EMPTY' => 'Bunu yapamazsınız çünkü hala grupla ilişkili kullanıcılar var{{name}}.', 'PAGE_DESCRIPTION' => 'Siten için grupların bir listesi. Grupları silmek ve düzenlemek için yönetim araçları sağlar.', 'SUMMARY' => 'Grup özeti', - 'UPDATE' => 'Grup için detaylar güncellendi{{name}}' + 'UPDATE' => 'Grup için detaylar güncellendi{{name}}', ], 'MANUALLY_ACTIVATED' => "{{user_name}}'ın hesabı el ile aktifleştirildi", 'MASTER_ACCOUNT_EXISTS' => 'Ana hesap zaten mevcut!', 'MIGRATION' => [ - 'REQUIRED' => 'Veritabanını güncellemek gerek' + 'REQUIRED' => 'Veritabanını güncellemek gerek', ], 'PERMISSION' => [ @@ -83,7 +84,7 @@ 'PAGE_DESCRIPTION' => 'Siteniz için izinlerin bir listesi. Düzenleme yapmak ve izinleri kaldırmak yönetim araçları temin eder.', 'SUMMARY' => 'İzin Özeti', 'UPDATE' => 'İzinlerin Güncellenmesi', - 'VIA_ROLES' => 'Roller ile izin alımı' + 'VIA_ROLES' => 'Roller ile izin alımı', ], 'ROLE' => [ @@ -108,7 +109,7 @@ 'PAGE_DESCRIPTION' => 'Siteniz için rollerin bir listesi. Düzenlemek ve rolleri silmek için yönetim araçları sağlar.', 'PERMISSIONS_UPDATED' => 'Rol için izinler güncellendi{{name}}', 'SUMMARY' => 'Rol özeti', - 'UPDATED' => 'Rol için detaylar güncellendi{{name}}' + 'UPDATED' => 'Rol için detaylar güncellendi{{name}}', ], 'SYSTEM_INFO' => [ @@ -121,7 +122,7 @@ 'SERVER' => 'Web sunucu yazılımı', 'SPRINKLES' => 'Yüklü serpintiler', 'UF_VERSION' => 'UserFrosting sürümü', - 'URL' => 'Site kök url' + 'URL' => 'Site kök url', ], 'TOGGLE_COLUMNS' => 'Sütünları değiştirme', @@ -133,7 +134,7 @@ 'ADMIN' => [ 'CHANGE_PASSWORD' => 'Kullanıcı şifresini değiştir', 'SEND_PASSWORD_LINK' => 'Kullanıcıya kendi şifresini seçebileceği bir bağlantı gönder', - 'SET_PASSWORD' => 'Kullanıcının şifresi olarak ayarla' + 'SET_PASSWORD' => 'Kullanıcının şifresi olarak ayarla', ], 'ACTIVATE' => 'Aktif Kullanıcı', @@ -151,11 +152,11 @@ 'PAGE_DESCRIPTION' => 'Siten için kullanıcıların listesi. Kullanıcı detaylarını düzenlemek, elle kullanıcıları aktifleştirmek, kullanıcıları etkinleştirme/devre dışı bırakma, ve daha fazlası için yönetimsel araçlar sağlar.', 'SUMMARY' => 'Hesap özeti', 'VIEW_ALL' => 'Tüm kullanıcıları göster', - 'WITH_PERMISSION' => 'Bu izni olan kullanıcılar' + 'WITH_PERMISSION' => 'Bu izni olan kullanıcılar', ], 'X_USER' => [ 0 => 'Kullanıcı yok', 1 => '{{plural}} kullanıcı', - 2 => '{{plural}} kullanıcılar' - ] + 2 => '{{plural}} kullanıcılar', + ], ]; diff --git a/app/sprinkles/admin/locale/zh_CN/messages.php b/app/sprinkles/admin/locale/zh_CN/messages.php index 5030f2552..2a2e1a76c 100644 --- a/app/sprinkles/admin/locale/zh_CN/messages.php +++ b/app/sprinkles/admin/locale/zh_CN/messages.php @@ -1,5 +1,6 @@ '最后活动', 'PAGE' => '用户活动列表', - 'TIME' => '活动时间' + 'TIME' => '活动时间', ], 'ADMIN' => [ - 'PANEL' => '控制台' + 'PANEL' => '控制台', ], 'CACHE' => [ 'CLEAR' => '清除缓存', 'CLEAR_CONFIRM' => '你确定要清除此网站的缓存?', 'CLEAR_CONFIRM_YES' => '是的, 清除缓存', - 'CLEARED' => '缓存成功清除 !' + 'CLEARED' => '缓存成功清除 !', ], 'DASHBOARD' => '仪表盘', @@ -63,13 +64,13 @@ 'NOT_EMPTY' => '你不能这样做，因为还有用户在组 {{name}}.', 'PAGE_DESCRIPTION' => '网站组列表. 请管理编辑和删除组的工具.', 'SUMMARY' => '组简介', - 'UPDATE' => '组{{name}}的信息已经更新' + 'UPDATE' => '组{{name}}的信息已经更新', ], 'MANUALLY_ACTIVATED' => '{{user_name}} 账户已手动激活', 'MASTER_ACCOUNT_EXISTS' => '超级账户已存在!', 'MIGRATION' => [ - 'REQUIRED' => '数据库需要更新' + 'REQUIRED' => '数据库需要更新', ], 'PERMISSION' => [ @@ -85,7 +86,7 @@ 'PAGE_DESCRIPTION' => '网站的权限列表. 提供编辑和删除权限的工具.', 'SUMMARY' => '权限概要', 'UPDATE' => '更新权限', - 'VIA_ROLES' => '权限通过用户了' + 'VIA_ROLES' => '权限通过用户了', ], 'ROLE' => [ @@ -110,7 +111,7 @@ 'PAGE_DESCRIPTION' => '网站的角色列表. 请管理编辑和删除角色的工具.', 'PERMISSIONS_UPDATED' => '角色 {{name}} 的权限更新成功', 'SUMMARY' => '角色概要', - 'UPDATED' => '角色 {{name}} 更新成功' + 'UPDATED' => '角色 {{name}} 更新成功', ], 'SYSTEM_INFO' => [ @@ -123,7 +124,7 @@ 'SERVER' => '网站服务器', 'SPRINKLES' => '加载的 sprinkles', 'UF_VERSION' => 'UserFrosting 版本', - 'URL' => '网站根目录' + 'URL' => '网站根目录', ], 'TOGGLE_COLUMNS' => '加载列', @@ -135,7 +136,7 @@ 'ADMIN' => [ 'CHANGE_PASSWORD' => '修改用户密码', 'SEND_PASSWORD_LINK' => '发送允许该用户修改密码的链接', - 'SET_PASSWORD' => '设置用户的密码为' + 'SET_PASSWORD' => '设置用户的密码为', ], 'ACTIVATE' => '激活用户', @@ -152,11 +153,11 @@ 'PAGE_DESCRIPTION' => '网站用户列表. 提供编辑用户信息, 手动激活用户, 启用/禁用 用户等工具.', 'SUMMARY' => '账户概要', 'VIEW_ALL' => '浏览所有用户', - 'WITH_PERMISSION' => '有此权限的用户' + 'WITH_PERMISSION' => '有此权限的用户', ], 'X_USER' => [ 0 => '没有用户', 1 => '{{plural}} 用户', - 2 => '{{plural}} 用户' - ] + 2 => '{{plural}} 用户', + ], ]; diff --git a/app/sprinkles/admin/routes/activities.php b/app/sprinkles/admin/routes/activities.php index a68646556..ae64429d0 100644 --- a/app/sprinkles/admin/routes/activities.php +++ b/app/sprinkles/admin/routes/activities.php @@ -1,5 +1,6 @@ group('/activities', function () { diff --git a/app/sprinkles/admin/routes/admin.php b/app/sprinkles/admin/routes/admin.php index dd5baee99..f0fe77698 100644 --- a/app/sprinkles/admin/routes/admin.php +++ b/app/sprinkles/admin/routes/admin.php @@ -1,5 +1,6 @@ group('/dashboard', function () { diff --git a/app/sprinkles/admin/routes/groups.php b/app/sprinkles/admin/routes/groups.php index a4841a467..d10e140c5 100644 --- a/app/sprinkles/admin/routes/groups.php +++ b/app/sprinkles/admin/routes/groups.php @@ -1,5 +1,6 @@ group('/groups', function () { diff --git a/app/sprinkles/admin/routes/permissions.php b/app/sprinkles/admin/routes/permissions.php index 9f6871beb..4426575d4 100644 --- a/app/sprinkles/admin/routes/permissions.php +++ b/app/sprinkles/admin/routes/permissions.php @@ -1,5 +1,6 @@ group('/permissions', function () { diff --git a/app/sprinkles/admin/routes/roles.php b/app/sprinkles/admin/routes/roles.php index efcd21704..1c99ea90b 100644 --- a/app/sprinkles/admin/routes/roles.php +++ b/app/sprinkles/admin/routes/roles.php @@ -1,5 +1,6 @@ group('/roles', function () { diff --git a/app/sprinkles/admin/routes/users.php b/app/sprinkles/admin/routes/users.php index 0bcdbabd6..cebf8b459 100644 --- a/app/sprinkles/admin/routes/users.php +++ b/app/sprinkles/admin/routes/users.php @@ -1,5 +1,6 @@ group('/users', function () { diff --git a/app/sprinkles/admin/schema/requests/group/create.yaml b/app/sprinkles/admin/schema/requests/group/create.yaml index 8f5261ce4..09aa7c3b5 100644 --- a/app/sprinkles/admin/schema/requests/group/create.yaml +++ b/app/sprinkles/admin/schema/requests/group/create.yaml @@ -30,6 +30,4 @@ icon: min: 1 max: 100 message: VALIDATE.LENGTH_RANGE - required: - message: VALIDATE.REQUIRED description: diff --git a/app/sprinkles/admin/schema/requests/group/edit-info.yaml b/app/sprinkles/admin/schema/requests/group/edit-info.yaml index 6aa3f28e0..bce3dced9 100644 --- a/app/sprinkles/admin/schema/requests/group/edit-info.yaml +++ b/app/sprinkles/admin/schema/requests/group/edit-info.yaml @@ -1,6 +1,9 @@ --- name: validators: + required: + label: "&NAME" + message: VALIDATE.REQUIRED length: label: "&NAME" min: 1 @@ -10,6 +13,9 @@ name: - trim slug: validators: + required: + label: "&SLUG" + message: VALIDATE.REQUIRED length: label: "&SLUG" min: 1 @@ -24,4 +30,4 @@ icon: min: 1 max: 100 message: VALIDATE.LENGTH_RANGE -description: +description: diff --git a/app/sprinkles/admin/schema/requests/role/create.yaml b/app/sprinkles/admin/schema/requests/role/create.yaml index 8004184ee..26b0bb5e1 100644 --- a/app/sprinkles/admin/schema/requests/role/create.yaml +++ b/app/sprinkles/admin/schema/requests/role/create.yaml @@ -23,4 +23,4 @@ slug: message: VALIDATE.LENGTH_RANGE transformations: - trim -description: +description: diff --git a/app/sprinkles/admin/schema/requests/role/edit-field.yaml b/app/sprinkles/admin/schema/requests/role/edit-field.yaml index 05c1b2d89..6ac51ec30 100644 --- a/app/sprinkles/admin/schema/requests/role/edit-field.yaml +++ b/app/sprinkles/admin/schema/requests/role/edit-field.yaml @@ -17,7 +17,7 @@ slug: message: VALIDATE.LENGTH_RANGE transformations: - trim -description: +description: permissions: validators: array: diff --git a/app/sprinkles/admin/schema/requests/role/edit-info.yaml b/app/sprinkles/admin/schema/requests/role/edit-info.yaml index 1fa36c867..26b0bb5e1 100644 --- a/app/sprinkles/admin/schema/requests/role/edit-info.yaml +++ b/app/sprinkles/admin/schema/requests/role/edit-info.yaml @@ -1,6 +1,9 @@ --- name: validators: + required: + label: "&NAME" + message: VALIDATE.REQUIRED length: label: "&NAME" min: 1 @@ -10,6 +13,9 @@ name: - trim slug: validators: + required: + label: "&SLUG" + message: VALIDATE.REQUIRED length: label: "&SLUG" min: 1 @@ -17,4 +23,4 @@ slug: message: VALIDATE.LENGTH_RANGE transformations: - trim -description: +description: diff --git a/app/sprinkles/admin/src/Admin.php b/app/sprinkles/admin/src/Admin.php index 284d2f420..d3a98b0b8 100644 --- a/app/sprinkles/admin/src/Admin.php +++ b/app/sprinkles/admin/src/Admin.php @@ -1,5 +1,6 @@ ci->classMapper; // Probably a better way to do this - $users = $classMapper->staticMethod('user', 'orderBy', 'created_at', 'desc') + $users = $classMapper->getClassMapping('user')::orderBy('created_at', 'desc') ->take(8) ->get(); @@ -70,26 +72,26 @@ public function pageDashboard(Request $request, Response $response, $args) return $this->ci->view->render($response, 'pages/dashboard.html.twig', [ 'counter' => [ - 'users' => $classMapper->staticMethod('user', 'count'), - 'roles' => $classMapper->staticMethod('role', 'count'), - 'groups' => $classMapper->staticMethod('group', 'count') + 'users' => $classMapper->getClassMapping('user')::count(), + 'roles' => $classMapper->getClassMapping('role')::count(), + 'groups' => $classMapper->getClassMapping('group')::count(), ], 'info' => [ 'version' => [ 'UF' => \UserFrosting\VERSION, 'php' => phpversion(), - 'database' => EnvironmentInfo::database() + 'database' => EnvironmentInfo::database(), ], 'database' => [ - 'name' => $config['db.default.database'] + 'name' => $config['db.default.database'], ], 'environment' => $this->ci->environment, 'path' => [ - 'project' => \UserFrosting\ROOT_DIR - ] + 'project' => \UserFrosting\ROOT_DIR, + ], ], 'sprinkles' => $sprinkles, - 'users' => $users + 'users' => $users, ]); } @@ -98,6 +100,7 @@ public function pageDashboard(Request $request, Response $response, $args) * * This route requires authentication. * Request type: POST + * * @param Request $request * @param Response $response * @param array $args @@ -132,6 +135,7 @@ public function clearCache(Request $request, Response $response, $args) * This does NOT render a complete page. Instead, it renders the HTML for the modal, which can be embedded in other pages. * This page requires authentication. * Request type: GET + * * @param Request $request * @param Response $response * @param array $args @@ -152,7 +156,7 @@ public function getModalConfirmClearCache(Request $request, Response $response, return $this->ci->view->render($response, 'modals/confirm-clear-cache.html.twig', [ 'form' => [ 'action' => 'api/dashboard/clear-cache', - ] + ], ]); } } diff --git a/app/sprinkles/admin/src/Controller/GroupController.php b/app/sprinkles/admin/src/Controller/GroupController.php index 56bee3d23..1490d180c 100644 --- a/app/sprinkles/admin/src/Controller/GroupController.php +++ b/app/sprinkles/admin/src/Controller/GroupController.php @@ -1,5 +1,6 @@ ci->classMapper; // Check if name or slug already exists - if ($classMapper->staticMethod('group', 'where', 'name', $data['name'])->first()) { + if ($classMapper->getClassMapping('group')::where('name', $data['name'])->first()) { $ms->addMessageTranslated('danger', 'GROUP.NAME.IN_USE', $data); $error = true; } - if ($classMapper->staticMethod('group', 'where', 'slug', $data['slug'])->first()) { + if ($classMapper->getClassMapping('group')::where('slug', $data['slug'])->first()) { $ms->addMessageTranslated('danger', 'GROUP.SLUG.IN_USE', $data); $error = true; } @@ -113,7 +117,7 @@ public function create(Request $request, Response $response, $args) // Create activity record $this->ci->userActivityLogger->info("User {$currentUser->user_name} created group {$group->name}.", [ 'type' => 'group_create', - 'user_id' => $currentUser->id + 'user_id' => $currentUser->id, ]); $ms->addMessageTranslated('success', 'GROUP.CREATION_SUCCESSFUL', $data); @@ -134,9 +138,11 @@ public function create(Request $request, Response $response, $args) * This route requires authentication (and should generally be limited to admins or the root user). * * Request type: DELETE - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If group is not found * @throws ForbiddenException If user is not authozied to access page * @throws BadRequestException @@ -158,7 +164,7 @@ public function delete(Request $request, Response $response, $args) // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'delete_group', [ - 'group' => $group + 'group' => $group, ])) { throw new ForbiddenException(); } @@ -171,6 +177,7 @@ public function delete(Request $request, Response $response, $args) if ($group->slug == $config['site.registration.user_defaults.group']) { $e = new BadRequestException(); $e->addUserMessage('GROUP.DELETE_DEFAULT', $group->toArray()); + throw $e; } @@ -178,10 +185,11 @@ public function delete(Request $request, Response $response, $args) $classMapper = $this->ci->classMapper; // Check if there are any users in this group - $countGroupUsers = $classMapper->staticMethod('user', 'where', 'group_id', $group->id)->count(); + $countGroupUsers = $classMapper->getClassMapping('user')::where('group_id', $group->id)->count(); if ($countGroupUsers > 0) { $e = new BadRequestException(); $e->addUserMessage('GROUP.NOT_EMPTY', $group->toArray()); + throw $e; } @@ -195,7 +203,7 @@ public function delete(Request $request, Response $response, $args) // Create activity record $this->ci->userActivityLogger->info("User {$currentUser->user_name} deleted group {$groupName}.", [ 'type' => 'group_delete', - 'user_id' => $currentUser->id + 'user_id' => $currentUser->id, ]); }); @@ -203,7 +211,7 @@ public function delete(Request $request, Response $response, $args) $ms = $this->ci->alerts; $ms->addMessageTranslated('success', 'GROUP.DELETION_SUCCESSFUL', [ - 'name' => $groupName + 'name' => $groupName, ]); return $response->withJson([], 200); @@ -215,9 +223,11 @@ public function delete(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page * @throws NotFoundException If group is not found */ @@ -239,7 +249,7 @@ public function getInfo(Request $request, Response $response, $args) /** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */ $classMapper = $this->ci->classMapper; - $group = $classMapper->staticMethod('group', 'where', 'slug', $slug)->first(); + $group = $classMapper->getClassMapping('group')::where('slug', $slug)->first(); // If the group doesn't exist, return 404 if (!$group) { @@ -255,15 +265,17 @@ public function getInfo(Request $request, Response $response, $args) } /** - * Returns a list of Groups + * Returns a list of Groups. * * Generates a list of groups, optionally paginated, sorted and/or filtered. * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function getList(Request $request, Response $response, $args) @@ -293,11 +305,12 @@ public function getList(Request $request, Response $response, $args) } /** - * Get deletetion confirmation modal + * Get deletetion confirmation modal. + * + * @param Request $request + * @param Response $response + * @param array $args * - * @param Request $request - * @param Response $response - * @param array $args * @throws NotFoundException If group is not found * @throws ForbiddenException If user is not authozied to access page * @throws BadRequestException @@ -322,7 +335,7 @@ public function getModalConfirmDelete(Request $request, Response $response, $arg // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'delete_group', [ - 'group' => $group + 'group' => $group, ])) { throw new ForbiddenException(); } @@ -331,10 +344,11 @@ public function getModalConfirmDelete(Request $request, Response $response, $arg $classMapper = $this->ci->classMapper; // Check if there are any users in this group - $countGroupUsers = $classMapper->staticMethod('user', 'where', 'group_id', $group->id)->count(); + $countGroupUsers = $classMapper->getClassMapping('user')::where('group_id', $group->id)->count(); if ($countGroupUsers > 0) { $e = new BadRequestException(); $e->addUserMessage('GROUP.NOT_EMPTY', $group->toArray()); + throw $e; } @@ -342,7 +356,7 @@ public function getModalConfirmDelete(Request $request, Response $response, $arg 'group' => $group, 'form' => [ 'action' => "api/groups/g/{$group->slug}", - ] + ], ]); } @@ -353,16 +367,15 @@ public function getModalConfirmDelete(Request $request, Response $response, $arg * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function getModalCreate(Request $request, Response $response, $args) { - // GET parameters - $params = $request->getQueryParams(); - /** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */ $authorizer = $this->ci->authorizer; @@ -388,7 +401,7 @@ public function getModalCreate(Request $request, Response $response, $args) $fieldNames = ['name', 'slug', 'icon', 'description']; $fields = [ 'hidden' => [], - 'disabled' => [] + 'disabled' => [], ]; // Load validation rules @@ -401,11 +414,11 @@ public function getModalCreate(Request $request, Response $response, $args) 'action' => 'api/groups', 'method' => 'POST', 'fields' => $fields, - 'submit_text' => $translator->translate('CREATE') + 'submit_text' => $translator->translate('CREATE'), ], 'page' => [ - 'validators' => $validator->rules('json', false) - ] + 'validators' => $validator->rules('json', false), + ], ]); } @@ -416,9 +429,11 @@ public function getModalCreate(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If group is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -450,7 +465,7 @@ public function getModalEdit(Request $request, Response $response, $args) $fieldNames = ['name', 'slug', 'icon', 'description']; if (!$authorizer->checkAccess($currentUser, 'update_group_field', [ 'group' => $group, - 'fields' => $fieldNames + 'fields' => $fieldNames, ])) { throw new ForbiddenException(); } @@ -458,7 +473,7 @@ public function getModalEdit(Request $request, Response $response, $args) // Generate form $fields = [ 'hidden' => [], - 'disabled' => [] + 'disabled' => [], ]; // Load validation rules @@ -471,20 +486,21 @@ public function getModalEdit(Request $request, Response $response, $args) 'action' => "api/groups/g/{$group->slug}", 'method' => 'PUT', 'fields' => $fields, - 'submit_text' => $translator->translate('UPDATE') + 'submit_text' => $translator->translate('UPDATE'), ], 'page' => [ - 'validators' => $validator->rules('json', false) - ] + 'validators' => $validator->rules('json', false), + ], ]); } /** - * Users List API + * Users List API. + * + * @param Request $request + * @param Response $response + * @param array $args * - * @param Request $request - * @param Response $response - * @param array $args * @throws NotFoundException If group is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -509,7 +525,7 @@ public function getUsers(Request $request, Response $response, $args) // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'view_group_field', [ 'group' => $group, - 'property' => 'users' + 'property' => 'users', ])) { throw new ForbiddenException(); } @@ -536,9 +552,11 @@ public function getUsers(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function pageInfo(Request $request, Response $response, $args) @@ -558,7 +576,7 @@ public function pageInfo(Request $request, Response $response, $args) // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'uri_group', [ - 'group' => $group + 'group' => $group, ])) { throw new ForbiddenException(); } @@ -568,13 +586,13 @@ public function pageInfo(Request $request, Response $response, $args) // Generate form $fields = [ - 'hidden' => [] + 'hidden' => [], ]; foreach ($fieldNames as $field) { if (!$authorizer->checkAccess($currentUser, 'view_group_field', [ 'group' => $group, - 'property' => $field + 'property' => $field, ])) { $fields['hidden'][] = $field; } @@ -582,27 +600,27 @@ public function pageInfo(Request $request, Response $response, $args) // Determine buttons to display $editButtons = [ - 'hidden' => [] + 'hidden' => [], ]; if (!$authorizer->checkAccess($currentUser, 'update_group_field', [ 'group' => $group, - 'fields' => ['name', 'slug', 'icon', 'description'] + 'fields' => ['name', 'slug', 'icon', 'description'], ])) { $editButtons['hidden'][] = 'edit'; } if (!$authorizer->checkAccess($currentUser, 'delete_group', [ - 'group' => $group + 'group' => $group, ])) { $editButtons['hidden'][] = 'delete'; } return $this->ci->view->render($response, 'pages/group.html.twig', [ - 'group' => $group, - 'fields' => $fields, - 'tools' => $editButtons, - 'delete_redirect' => $this->ci->router->pathFor('uri_groups') + 'group' => $group, + 'fields' => $fields, + 'tools' => $editButtons, + 'delete_redirect' => $this->ci->router->pathFor('uri_groups'), ]); } @@ -614,9 +632,11 @@ public function pageInfo(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function pageList(Request $request, Response $response, $args) @@ -645,10 +665,13 @@ public function pageList(Request $request, Response $response, $args) * This route requires authentication (and should generally be limited to admins or the root user). * * Request type: PUT + * * @see getModalGroupEdit - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If group is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -661,9 +684,6 @@ public function updateInfo(Request $request, Response $response, $args) throw new NotFoundException(); } - /** @var \UserFrosting\Support\Repository\Repository $config */ - $config = $this->ci->config; - // Get PUT parameters: (name, slug, icon, description) $params = $request->getParsedBody(); @@ -701,7 +721,7 @@ public function updateInfo(Request $request, Response $response, $args) // Access-controlled resource - check that currentUser has permission to edit submitted fields for this group if (!$authorizer->checkAccess($currentUser, 'update_group_field', [ 'group' => $group, - 'fields' => array_values(array_unique($fieldNames)) + 'fields' => array_values(array_unique($fieldNames)), ])) { throw new ForbiddenException(); } @@ -713,7 +733,7 @@ public function updateInfo(Request $request, Response $response, $args) if ( isset($data['name']) && $data['name'] != $group->name && - $classMapper->staticMethod('group', 'where', 'name', $data['name'])->first() + $classMapper->getClassMapping('group')::where('name', $data['name'])->first() ) { $ms->addMessageTranslated('danger', 'GROUP.NAME.IN_USE', $data); $error = true; @@ -722,7 +742,7 @@ public function updateInfo(Request $request, Response $response, $args) if ( isset($data['slug']) && $data['slug'] != $group->slug && - $classMapper->staticMethod('group', 'where', 'slug', $data['slug'])->first() + $classMapper->getClassMapping('group')::where('slug', $data['slug'])->first() ) { $ms->addMessageTranslated('danger', 'GROUP.SLUG.IN_USE', $data); $error = true; @@ -746,22 +766,24 @@ public function updateInfo(Request $request, Response $response, $args) // Create activity record $this->ci->userActivityLogger->info("User {$currentUser->user_name} updated details for group {$group->name}.", [ 'type' => 'group_update_info', - 'user_id' => $currentUser->id + 'user_id' => $currentUser->id, ]); }); $ms->addMessageTranslated('success', 'GROUP.UPDATE', [ - 'name' => $group->name + 'name' => $group->name, ]); return $response->withJson([], 200); } /** - * Get group from params + * Get group from params. + * + * @param array $params * - * @param array $params * @throws BadRequestException + * * @return Group */ protected function getGroupFromParams($params) @@ -783,6 +805,7 @@ protected function getGroupFromParams($params) $e->addUserMessage($error); } } + throw $e; } @@ -790,7 +813,7 @@ protected function getGroupFromParams($params) $classMapper = $this->ci->classMapper; // Get the group - $group = $classMapper->staticMethod('group', 'where', 'slug', $data['slug']) + $group = $classMapper->getClassMapping('group')::where('slug', $data['slug']) ->first(); return $group; diff --git a/app/sprinkles/admin/src/Controller/PermissionController.php b/app/sprinkles/admin/src/Controller/PermissionController.php index 402442ef6..de0991666 100644 --- a/app/sprinkles/admin/src/Controller/PermissionController.php +++ b/app/sprinkles/admin/src/Controller/PermissionController.php @@ -1,5 +1,6 @@ ci->classMapper; - $permission = $classMapper->staticMethod('permission', 'find', $permissionId); + $permission = $classMapper->getClassMapping('permission')::find($permissionId); // If the permission doesn't exist, return 404 if (!$permission) { @@ -68,15 +71,17 @@ public function getInfo(Request $request, Response $response, $args) } /** - * Returns a list of Permissions + * Returns a list of Permissions. * * Generates a list of permissions, optionally paginated, sorted and/or filtered. * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function getList(Request $request, Response $response, $args) @@ -112,9 +117,11 @@ public function getList(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function getUsers(Request $request, Response $response, $args) @@ -154,9 +161,11 @@ public function getUsers(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page * @throws NotFoundException If permission is not found */ @@ -178,7 +187,7 @@ public function pageInfo(Request $request, Response $response, $args) /** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */ $classMapper = $this->ci->classMapper; - $permission = $classMapper->staticMethod('permission', 'find', $permissionId); + $permission = $classMapper->getClassMapping('permission')::find($permissionId); // If the permission doesn't exist, return 404 if (!$permission) { @@ -186,7 +195,7 @@ public function pageInfo(Request $request, Response $response, $args) } return $this->ci->view->render($response, 'pages/permission.html.twig', [ - 'permission' => $permission + 'permission' => $permission, ]); } @@ -198,9 +207,11 @@ public function pageInfo(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function pageList(Request $request, Response $response, $args) diff --git a/app/sprinkles/admin/src/Controller/RoleController.php b/app/sprinkles/admin/src/Controller/RoleController.php index 3232e266c..d1255e6d5 100644 --- a/app/sprinkles/admin/src/Controller/RoleController.php +++ b/app/sprinkles/admin/src/Controller/RoleController.php @@ -1,5 +1,6 @@ ci->classMapper; // Check if name or slug already exists - if ($classMapper->staticMethod('role', 'where', 'name', $data['name'])->first()) { + if ($classMapper->getClassMapping('role')::where('name', $data['name'])->first()) { $ms->addMessageTranslated('danger', 'ROLE.NAME_IN_USE', $data); $error = true; } - if ($classMapper->staticMethod('role', 'where', 'slug', $data['slug'])->first()) { + if ($classMapper->getClassMapping('role')::where('slug', $data['slug'])->first()) { $ms->addMessageTranslated('danger', 'SLUG_IN_USE', $data); $error = true; } @@ -113,7 +117,7 @@ public function create(Request $request, Response $response, $args) // Create activity record $this->ci->userActivityLogger->info("User {$currentUser->user_name} created role {$role->name}.", [ 'type' => 'role_create', - 'user_id' => $currentUser->id + 'user_id' => $currentUser->id, ]); $ms->addMessageTranslated('success', 'ROLE.CREATION_SUCCESSFUL', $data); @@ -134,9 +138,11 @@ public function create(Request $request, Response $response, $args) * This route requires authentication (and should generally be limited to admins or the root user). * * Request type: DELETE - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If role is not found * @throws ForbiddenException If user is not authozied to access page * @throws BadRequestException @@ -158,7 +164,7 @@ public function delete(Request $request, Response $response, $args) // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'delete_role', [ - 'role' => $role + 'role' => $role, ])) { throw new ForbiddenException(); } @@ -167,12 +173,13 @@ public function delete(Request $request, Response $response, $args) $classMapper = $this->ci->classMapper; // Check that we are not deleting a default role - $defaultRoleSlugs = $classMapper->staticMethod('role', 'getDefaultSlugs'); + $defaultRoleSlugs = $classMapper->getClassMapping('role')::getDefaultSlugs(); // Need to use loose comparison for now, because some DBs return `id` as a string if (in_array($role->slug, $defaultRoleSlugs)) { $e = new BadRequestException(); $e->addUserMessage('ROLE.DELETE_DEFAULT'); + throw $e; } @@ -181,6 +188,7 @@ public function delete(Request $request, Response $response, $args) if ($countUsers > 0) { $e = new BadRequestException(); $e->addUserMessage('ROLE.HAS_USERS'); + throw $e; } @@ -194,7 +202,7 @@ public function delete(Request $request, Response $response, $args) // Create activity record $this->ci->userActivityLogger->info("User {$currentUser->user_name} deleted role {$roleName}.", [ 'type' => 'role_delete', - 'user_id' => $currentUser->id + 'user_id' => $currentUser->id, ]); }); @@ -202,7 +210,7 @@ public function delete(Request $request, Response $response, $args) $ms = $this->ci->alerts; $ms->addMessageTranslated('success', 'ROLE.DELETION_SUCCESSFUL', [ - 'name' => $roleName + 'name' => $roleName, ]); return $response->withJson([], 200); @@ -214,9 +222,11 @@ public function delete(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page * @throws NotFoundException If role is not found */ @@ -238,7 +248,7 @@ public function getInfo(Request $request, Response $response, $args) /** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */ $classMapper = $this->ci->classMapper; - $role = $classMapper->staticMethod('role', 'where', 'slug', $slug)->first(); + $role = $classMapper->getClassMapping('role')::where('slug', $slug)->first(); // If the role doesn't exist, return 404 if (!$role) { @@ -254,15 +264,17 @@ public function getInfo(Request $request, Response $response, $args) } /** - * Returns a list of Roles + * Returns a list of Roles. * * Generates a list of roles, optionally paginated, sorted and/or filtered. * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function getList(Request $request, Response $response, $args) @@ -292,11 +304,12 @@ public function getList(Request $request, Response $response, $args) } /** - * Display deletion confirmation modal + * Display deletion confirmation modal. + * + * @param Request $request + * @param Response $response + * @param array $args * - * @param Request $request - * @param Response $response - * @param array $args * @throws NotFoundException If role is not found * @throws ForbiddenException If user is not authozied to access page * @throws BadRequestException @@ -321,7 +334,7 @@ public function getModalConfirmDelete(Request $request, Response $response, $arg // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'delete_role', [ - 'role' => $role + 'role' => $role, ])) { throw new ForbiddenException(); } @@ -330,12 +343,13 @@ public function getModalConfirmDelete(Request $request, Response $response, $arg $classMapper = $this->ci->classMapper; // Check that we are not deleting a default role - $defaultRoleSlugs = $classMapper->staticMethod('role', 'getDefaultSlugs'); + $defaultRoleSlugs = $classMapper->getClassMapping('role')::getDefaultSlugs(); // Need to use loose comparison for now, because some DBs return `id` as a string if (in_array($role->slug, $defaultRoleSlugs)) { $e = new BadRequestException(); $e->addUserMessage('ROLE.DELETE_DEFAULT', $role->toArray()); + throw $e; } @@ -344,6 +358,7 @@ public function getModalConfirmDelete(Request $request, Response $response, $arg if ($countUsers > 0) { $e = new BadRequestException(); $e->addUserMessage('ROLE.HAS_USERS', $role->toArray()); + throw $e; } @@ -351,7 +366,7 @@ public function getModalConfirmDelete(Request $request, Response $response, $arg 'role' => $role, 'form' => [ 'action' => "api/roles/r/{$role->slug}", - ] + ], ]); } @@ -362,9 +377,11 @@ public function getModalConfirmDelete(Request $request, Response $response, $arg * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function getModalCreate(Request $request, Response $response, $args) @@ -395,7 +412,7 @@ public function getModalCreate(Request $request, Response $response, $args) $fieldNames = ['name', 'slug', 'description']; $fields = [ 'hidden' => [], - 'disabled' => [] + 'disabled' => [], ]; // Load validation rules @@ -408,11 +425,11 @@ public function getModalCreate(Request $request, Response $response, $args) 'action' => 'api/roles', 'method' => 'POST', 'fields' => $fields, - 'submit_text' => $translator->translate('CREATE') + 'submit_text' => $translator->translate('CREATE'), ], 'page' => [ - 'validators' => $validator->rules('json', false) - ] + 'validators' => $validator->rules('json', false), + ], ]); } @@ -423,9 +440,11 @@ public function getModalCreate(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If role is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -457,7 +476,7 @@ public function getModalEdit(Request $request, Response $response, $args) $fieldNames = ['name', 'slug', 'description']; if (!$authorizer->checkAccess($currentUser, 'update_role_field', [ 'role' => $role, - 'fields' => $fieldNames + 'fields' => $fieldNames, ])) { throw new ForbiddenException(); } @@ -465,7 +484,7 @@ public function getModalEdit(Request $request, Response $response, $args) // Generate form $fields = [ 'hidden' => [], - 'disabled' => [] + 'disabled' => [], ]; // Load validation rules @@ -478,11 +497,11 @@ public function getModalEdit(Request $request, Response $response, $args) 'action' => "api/roles/r/{$role->slug}", 'method' => 'PUT', 'fields' => $fields, - 'submit_text' => $translator->translate('UPDATE') + 'submit_text' => $translator->translate('UPDATE'), ], 'page' => [ - 'validators' => $validator->rules('json', false) - ] + 'validators' => $validator->rules('json', false), + ], ]); } @@ -493,9 +512,11 @@ public function getModalEdit(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If role is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -520,13 +541,13 @@ public function getModalEditPermissions(Request $request, Response $response, $a // Access-controlled resource - check that currentUser has permission to edit "permissions" field for this role if (!$authorizer->checkAccess($currentUser, 'update_role_field', [ 'role' => $role, - 'fields' => ['permissions'] + 'fields' => ['permissions'], ])) { throw new ForbiddenException(); } return $this->ci->view->render($response, 'modals/role-manage-permissions.html.twig', [ - 'role' => $role + 'role' => $role, ]); } @@ -537,9 +558,11 @@ public function getModalEditPermissions(Request $request, Response $response, $a * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If role is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -564,7 +587,7 @@ public function getPermissions(Request $request, Response $response, $args) // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'view_role_field', [ 'role' => $role, - 'property' => 'permissions' + 'property' => 'permissions', ])) { throw new ForbiddenException(); } @@ -588,9 +611,11 @@ public function getPermissions(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If role is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -618,7 +643,7 @@ public function getUsers(Request $request, Response $response, $args) // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'view_role_field', [ 'role' => $role, - 'property' => 'users' + 'property' => 'users', ])) { throw new ForbiddenException(); } @@ -642,9 +667,11 @@ public function getUsers(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function pageInfo(Request $request, Response $response, $args) @@ -664,7 +691,7 @@ public function pageInfo(Request $request, Response $response, $args) // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'uri_role', [ - 'role' => $role + 'role' => $role, ])) { throw new ForbiddenException(); } @@ -674,13 +701,13 @@ public function pageInfo(Request $request, Response $response, $args) // Generate form $fields = [ - 'hidden' => [] + 'hidden' => [], ]; foreach ($fieldNames as $field) { if (!$authorizer->checkAccess($currentUser, 'view_role_field', [ 'role' => $role, - 'property' => $field + 'property' => $field, ])) { $fields['hidden'][] = $field; } @@ -688,27 +715,27 @@ public function pageInfo(Request $request, Response $response, $args) // Determine buttons to display $editButtons = [ - 'hidden' => [] + 'hidden' => [], ]; if (!$authorizer->checkAccess($currentUser, 'update_role_field', [ 'role' => $role, - 'fields' => ['name', 'slug', 'description'] + 'fields' => ['name', 'slug', 'description'], ])) { $editButtons['hidden'][] = 'edit'; } if (!$authorizer->checkAccess($currentUser, 'delete_role', [ - 'role' => $role + 'role' => $role, ])) { $editButtons['hidden'][] = 'delete'; } return $this->ci->view->render($response, 'pages/role.html.twig', [ - 'role' => $role, - 'fields' => $fields, - 'tools' => $editButtons, - 'delete_redirect' => $this->ci->router->pathFor('uri_roles') + 'role' => $role, + 'fields' => $fields, + 'tools' => $editButtons, + 'delete_redirect' => $this->ci->router->pathFor('uri_roles'), ]); } @@ -720,9 +747,11 @@ public function pageInfo(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function pageList(Request $request, Response $response, $args) @@ -751,10 +780,13 @@ public function pageList(Request $request, Response $response, $args) * This route requires authentication (and should generally be limited to admins or the root user). * * Request type: PUT + * * @see getModalRoleEdit - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If role is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -807,7 +839,7 @@ public function updateInfo(Request $request, Response $response, $args) // Access-controlled resource - check that currentUser has permission to edit submitted fields for this role if (!$authorizer->checkAccess($currentUser, 'update_role_field', [ 'role' => $role, - 'fields' => array_values(array_unique($fieldNames)) + 'fields' => array_values(array_unique($fieldNames)), ])) { throw new ForbiddenException(); } @@ -819,7 +851,7 @@ public function updateInfo(Request $request, Response $response, $args) if ( isset($data['name']) && $data['name'] != $role->name && - $classMapper->staticMethod('role', 'where', 'name', $data['name'])->first() + $classMapper->getClassMapping('role')::where('name', $data['name'])->first() ) { $ms->addMessageTranslated('danger', 'ROLE.NAME_IN_USE', $data); $error = true; @@ -828,7 +860,7 @@ public function updateInfo(Request $request, Response $response, $args) if ( isset($data['slug']) && $data['slug'] != $role->slug && - $classMapper->staticMethod('role', 'where', 'slug', $data['slug'])->first() + $classMapper->getClassMapping('role')::where('slug', $data['slug'])->first() ) { $ms->addMessageTranslated('danger', 'SLUG_IN_USE', $data); $error = true; @@ -852,12 +884,12 @@ public function updateInfo(Request $request, Response $response, $args) // Create activity record $this->ci->userActivityLogger->info("User {$currentUser->user_name} updated details for role {$role->name}.", [ 'type' => 'role_update_info', - 'user_id' => $currentUser->id + 'user_id' => $currentUser->id, ]); }); $ms->addMessageTranslated('success', 'ROLE.UPDATED', [ - 'name' => $role->name + 'name' => $role->name, ]); return $response->withJson([], 200); @@ -872,9 +904,11 @@ public function updateInfo(Request $request, Response $response, $args) * This route requires authentication. * * Request type: PUT - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If role is not found * @throws ForbiddenException If user is not authozied to access page * @throws BadRequestException @@ -900,7 +934,7 @@ public function updateField(Request $request, Response $response, $args) // Access-controlled resource - check that currentUser has permission to edit the specified field for this user if (!$authorizer->checkAccess($currentUser, 'update_role_field', [ 'role' => $role, - 'fields' => [$fieldName] + 'fields' => [$fieldName], ])) { throw new ForbiddenException(); } @@ -916,13 +950,15 @@ public function updateField(Request $request, Response $response, $args) } $params = [ - $fieldName => $put['value'] + $fieldName => $put['value'], ]; // Validate key -> value pair // Load the request schema $schema = new RequestSchema('schema://requests/role/edit-field.yaml'); + $schema->set('password.validators.length.min', $config['site.password.length.min']); + $schema->set('password.validators.length.max', $config['site.password.length.max']); // Whitelist and set parameter defaults $transformer = new RequestDataTransformer($schema); @@ -938,6 +974,7 @@ public function updateField(Request $request, Response $response, $args) $e->addUserMessage($error); } } + throw $e; } @@ -960,18 +997,18 @@ public function updateField(Request $request, Response $response, $args) // Create activity record $this->ci->userActivityLogger->info("User {$currentUser->user_name} updated property '$fieldName' for role {$role->name}.", [ 'type' => 'role_update_field', - 'user_id' => $currentUser->id + 'user_id' => $currentUser->id, ]); }); // Add success messages if ($fieldName == 'permissions') { $ms->addMessageTranslated('success', 'ROLE.PERMISSIONS_UPDATED', [ - 'name' => $role->name + 'name' => $role->name, ]); } else { $ms->addMessageTranslated('success', 'ROLE.UPDATED', [ - 'name' => $role->name + 'name' => $role->name, ]); } @@ -979,10 +1016,12 @@ public function updateField(Request $request, Response $response, $args) } /** - * Get role instance from params + * Get role instance from params. + * + * @param array $params * - * @param array $params * @throws BadRequestException + * * @return Role */ protected function getRoleFromParams($params) @@ -1004,6 +1043,7 @@ protected function getRoleFromParams($params) $e->addUserMessage($error); } } + throw $e; } @@ -1011,7 +1051,7 @@ protected function getRoleFromParams($params) $classMapper = $this->ci->classMapper; // Get the role - $role = $classMapper->staticMethod('role', 'where', 'slug', $data['slug']) + $role = $classMapper->getClassMapping('role')::where('slug', $data['slug']) ->first(); return $role; diff --git a/app/sprinkles/admin/src/Controller/UserController.php b/app/sprinkles/admin/src/Controller/UserController.php index d6293ec49..78f593984 100644 --- a/app/sprinkles/admin/src/Controller/UserController.php +++ b/app/sprinkles/admin/src/Controller/UserController.php @@ -1,5 +1,6 @@ ci->currentUser; + /** @var \UserFrosting\Support\Repository\Repository $config */ + $config = $this->ci->config; + // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'create_user')) { throw new ForbiddenException(); @@ -77,6 +84,11 @@ public function create(Request $request, Response $response, $args) $error = false; + // Ensure that in the case of using a single locale, that the locale is set bu inheriting from current user + if (count($config->getDefined('site.locales.available')) <= 1) { + $data['locale'] = $currentUser->locale; + } + // Validate request data $validator = new ServerSideValidator($schema, $this->ci->translator); if (!$validator->validate($data)) { @@ -87,13 +99,13 @@ public function create(Request $request, Response $response, $args) /** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */ $classMapper = $this->ci->classMapper; - // Check if username or email already exists - if ($classMapper->staticMethod('user', 'findUnique', $data['user_name'], 'user_name')) { + // Check if username or email already exists. If not set, validator will pick it up + if (isset($data['user_name']) && $classMapper->getClassMapping('user')::findUnique($data['user_name'], 'user_name')) { $ms->addMessageTranslated('danger', 'USERNAME.IN_USE', $data); $error = true; } - if ($classMapper->staticMethod('user', 'findUnique', $data['email'], 'email')) { + if (isset($data['email']) && $classMapper->getClassMapping('user')::findUnique($data['email'], 'email')) { $ms->addMessageTranslated('danger', 'EMAIL.IN_USE', $data); $error = true; } @@ -108,7 +120,7 @@ public function create(Request $request, Response $response, $args) // If currentUser does not have permission to set the group, but they try to set it to something other than their own group, // throw an exception. if (!$authorizer->checkAccess($currentUser, 'create_user_field', [ - 'fields' => ['group'] + 'fields' => ['group'], ])) { if (isset($data['group_id']) && $data['group_id'] != $currentUser->group_id) { throw new ForbiddenException(); @@ -136,12 +148,12 @@ public function create(Request $request, Response $response, $args) // Create activity record $this->ci->userActivityLogger->info("User {$currentUser->user_name} created a new account for {$user->user_name}.", [ 'type' => 'account_create', - 'user_id' => $currentUser->id + 'user_id' => $currentUser->id, ]); // Load default roles - $defaultRoleSlugs = $classMapper->staticMethod('role', 'getDefaultSlugs'); - $defaultRoles = $classMapper->staticMethod('role', 'whereIn', 'slug', $defaultRoleSlugs)->get(); + $defaultRoleSlugs = $classMapper->getClassMapping('role')::getDefaultSlugs(); + $defaultRoles = $classMapper->getClassMapping('role')::whereIn('slug', $defaultRoleSlugs)->get(); $defaultRoleIds = $defaultRoles->pluck('id')->all(); // Attach default roles @@ -158,7 +170,7 @@ public function create(Request $request, Response $response, $args) ->addParams([ 'user' => $user, 'create_password_expiration' => $config['password_reset.timeouts.create'] / 3600 . ' hours', - 'token' => $passwordRequest->getToken() + 'token' => $passwordRequest->getToken(), ]); $this->ci->mailer->send($message); @@ -180,9 +192,11 @@ public function create(Request $request, Response $response, $args) * This route requires authentication. * * Request type: POST - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If user is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -204,7 +218,7 @@ public function createPasswordReset(Request $request, Response $response, $args) // Access-controlled resource - check that currentUser has permission to edit "password" for this user if (!$authorizer->checkAccess($currentUser, 'update_user_field', [ 'user' => $user, - 'fields' => ['password'] + 'fields' => ['password'], ])) { throw new ForbiddenException(); } @@ -229,14 +243,14 @@ public function createPasswordReset(Request $request, Response $response, $args) ->addParams([ 'user' => $user, 'token' => $passwordReset->getToken(), - 'request_date' => Carbon::now()->format('Y-m-d H:i:s') + 'request_date' => Carbon::now()->format('Y-m-d H:i:s'), ]); $this->ci->mailer->send($message); }); $ms->addMessageTranslated('success', 'PASSWORD.FORGET.REQUEST_SENT', [ - 'email' => $user->email + 'email' => $user->email, ]); return $response->withJson([], 200); @@ -252,9 +266,11 @@ public function createPasswordReset(Request $request, Response $response, $args) * This route requires authentication (and should generally be limited to admins or the root user). * * Request type: DELETE - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If user is not found * @throws ForbiddenException If user is not authozied to access page * @throws BadRequestException @@ -276,7 +292,7 @@ public function delete(Request $request, Response $response, $args) // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'delete_user', [ - 'user' => $user + 'user' => $user, ])) { throw new ForbiddenException(); } @@ -289,6 +305,7 @@ public function delete(Request $request, Response $response, $args) if ($user->id == $config['reserved_user_ids.master']) { $e = new BadRequestException(); $e->addUserMessage('DELETE_MASTER'); + throw $e; } @@ -302,7 +319,7 @@ public function delete(Request $request, Response $response, $args) // Create activity record $this->ci->userActivityLogger->info("User {$currentUser->user_name} deleted the account for {$userName}.", [ 'type' => 'account_delete', - 'user_id' => $currentUser->id + 'user_id' => $currentUser->id, ]); }); @@ -310,7 +327,7 @@ public function delete(Request $request, Response $response, $args) $ms = $this->ci->alerts; $ms->addMessageTranslated('success', 'DELETION_SUCCESSFUL', [ - 'user_name' => $userName + 'user_name' => $userName, ]); return $response->withJson([], 200); @@ -321,9 +338,11 @@ public function delete(Request $request, Response $response, $args) * * This page requires authentication. * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If user is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -351,7 +370,7 @@ public function getActivities(Request $request, Response $response, $args) // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'view_user_field', [ 'user' => $user, - 'property' => 'activities' + 'property' => 'activities', ])) { throw new ForbiddenException(); } @@ -372,9 +391,11 @@ public function getActivities(Request $request, Response $response, $args) * * This page requires authentication. * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If user is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -405,7 +426,7 @@ public function getInfo(Request $request, Response $response, $args) // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'uri_user', [ - 'user' => $user + 'user' => $user, ])) { throw new ForbiddenException(); } @@ -418,14 +439,16 @@ public function getInfo(Request $request, Response $response, $args) } /** - * Returns a list of Users + * Returns a list of Users. * * Generates a list of users, optionally paginated, sorted and/or filtered. * This page requires authentication. * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function getList(Request $request, Response $response, $args) @@ -460,9 +483,11 @@ public function getList(Request $request, Response $response, $args) * This does NOT render a complete page. Instead, it renders the HTML for the modal, which can be embedded in other pages. * This page requires authentication. * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If user is not found * @throws ForbiddenException If user is not authozied to access page * @throws BadRequestException @@ -487,7 +512,7 @@ public function getModalConfirmDelete(Request $request, Response $response, $arg // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'delete_user', [ - 'user' => $user + 'user' => $user, ])) { throw new ForbiddenException(); } @@ -500,6 +525,7 @@ public function getModalConfirmDelete(Request $request, Response $response, $arg if ($user->id == $config['reserved_user_ids.master']) { $e = new BadRequestException(); $e->addUserMessage('DELETE_MASTER'); + throw $e; } @@ -507,7 +533,7 @@ public function getModalConfirmDelete(Request $request, Response $response, $arg 'user' => $user, 'form' => [ 'action' => "api/users/u/{$user->user_name}", - ] + ], ]); } @@ -520,16 +546,15 @@ public function getModalConfirmDelete(Request $request, Response $response, $arg * * This page requires authentication. * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function getModalCreate(Request $request, Response $response, $args) { - // GET parameters - $params = $request->getQueryParams(); - /** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */ $authorizer = $this->ci->authorizer; @@ -554,7 +579,7 @@ public function getModalCreate(Request $request, Response $response, $args) // TODO: come back to this when we finish implementing theming $fields = [ 'hidden' => ['theme'], - 'disabled' => [] + 'disabled' => [], ]; // Get a list of all locales @@ -563,21 +588,26 @@ public function getModalCreate(Request $request, Response $response, $args) // Determine if currentUser has permission to modify the group. If so, show the 'group' dropdown. // Otherwise, set to the currentUser's group and disable the dropdown. if ($authorizer->checkAccess($currentUser, 'create_user_field', [ - 'fields' => ['group'] + 'fields' => ['group'], ])) { // Get a list of all groups - $groups = $classMapper->staticMethod('group', 'all'); + $groups = $classMapper->getClassMapping('group')::all(); } else { // Get the current user's group $groups = $currentUser->group()->get(); $fields['disabled'][] = 'group'; } + // Hide the locale field if there is only 1 locale available + if (count($config->getDefined('site.locales.available')) <= 1) { + $fields['hidden'][] = 'locale'; + } + // Create a dummy user to prepopulate fields $data = [ 'group_id' => $currentUser->group_id, 'locale' => $config['site.registration.user_defaults.locale'], - 'theme' => '' + 'theme' => '', ]; $user = $classMapper->createInstance('user', $data); @@ -594,11 +624,11 @@ public function getModalCreate(Request $request, Response $response, $args) 'action' => 'api/users', 'method' => 'POST', 'fields' => $fields, - 'submit_text' => $translator->translate('CREATE') + 'submit_text' => $translator->translate('CREATE'), ], 'page' => [ - 'validators' => $validator->rules('json', false) - ] + 'validators' => $validator->rules('json', false), + ], ]); } @@ -609,9 +639,11 @@ public function getModalCreate(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If user is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -631,7 +663,8 @@ public function getModalEdit(Request $request, Response $response, $args) $classMapper = $this->ci->classMapper; // Get the user to edit - $user = $classMapper->staticMethod('user', 'where', 'user_name', $user->user_name) + $user = $classMapper->getClassMapping('user') + ::where('user_name', $user->user_name) ->with('group') ->first(); @@ -645,13 +678,13 @@ public function getModalEdit(Request $request, Response $response, $args) $fieldNames = ['name', 'email', 'locale']; if (!$authorizer->checkAccess($currentUser, 'update_user_field', [ 'user' => $user, - 'fields' => $fieldNames + 'fields' => $fieldNames, ])) { throw new ForbiddenException(); } // Get a list of all groups - $groups = $classMapper->staticMethod('group', 'all'); + $groups = $classMapper->getClassMapping('group')::all(); /** @var \UserFrosting\Support\Repository\Repository $config */ $config = $this->ci->config; @@ -662,17 +695,22 @@ public function getModalEdit(Request $request, Response $response, $args) // Generate form $fields = [ 'hidden' => ['theme'], - 'disabled' => ['user_name'] + 'disabled' => ['user_name'], ]; // Disable group field if currentUser doesn't have permission to modify group if (!$authorizer->checkAccess($currentUser, 'update_user_field', [ 'user' => $user, - 'fields' => ['group'] + 'fields' => ['group'], ])) { $fields['disabled'][] = 'group'; } + // Hide the locale field if there is only 1 locale available + if (count($config->getDefined('site.locales.available')) <= 1) { + $fields['hidden'][] = 'locale'; + } + // Load validation rules $schema = new RequestSchema('schema://requests/user/edit-info.yaml'); $validator = new JqueryValidationAdapter($schema, $this->ci->translator); @@ -687,11 +725,11 @@ public function getModalEdit(Request $request, Response $response, $args) 'action' => "api/users/u/{$user->user_name}", 'method' => 'PUT', 'fields' => $fields, - 'submit_text' => $translator->translate('UPDATE') + 'submit_text' => $translator->translate('UPDATE'), ], 'page' => [ - 'validators' => $validator->rules('json', false) - ] + 'validators' => $validator->rules('json', false), + ], ]); } @@ -702,9 +740,11 @@ public function getModalEdit(Request $request, Response $response, $args) * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If user is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -726,23 +766,30 @@ public function getModalEditPassword(Request $request, Response $response, $args /** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */ $currentUser = $this->ci->currentUser; + /** @var \UserFrosting\Support\Repository\Repository $config */ + $config = $this->ci->config; + // Access-controlled resource - check that currentUser has permission to edit "password" field for this user if (!$authorizer->checkAccess($currentUser, 'update_user_field', [ 'user' => $user, - 'fields' => ['password'] + 'fields' => ['password'], ])) { throw new ForbiddenException(); } // Load validation rules $schema = new RequestSchema('schema://requests/user/edit-password.yaml'); + $schema->set('value.validators.length.min', $config['site.password.length.min']); + $schema->set('value.validators.length.max', $config['site.password.length.max']); + $schema->set('passwordc.validators.length.min', $config['site.password.length.min']); + $schema->set('passwordc.validators.length.max', $config['site.password.length.max']); $validator = new JqueryValidationAdapter($schema, $this->ci->translator); return $this->ci->view->render($response, 'modals/user-set-password.html.twig', [ 'user' => $user, 'page' => [ - 'validators' => $validator->rules('json', false) - ] + 'validators' => $validator->rules('json', false), + ], ]); } @@ -753,9 +800,11 @@ public function getModalEditPassword(Request $request, Response $response, $args * This page requires authentication. * * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If user is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -780,13 +829,13 @@ public function getModalEditRoles(Request $request, Response $response, $args) // Access-controlled resource - check that currentUser has permission to edit "roles" field for this user if (!$authorizer->checkAccess($currentUser, 'update_user_field', [ 'user' => $user, - 'fields' => ['roles'] + 'fields' => ['roles'], ])) { throw new ForbiddenException(); } return $this->ci->view->render($response, 'modals/user-manage-roles.html.twig', [ - 'user' => $user + 'user' => $user, ]); } @@ -796,9 +845,11 @@ public function getModalEditRoles(Request $request, Response $response, $args) * Generates a list of permissions, optionally paginated, sorted and/or filtered. * This page requires authentication. * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If user is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -823,7 +874,7 @@ public function getPermissions(Request $request, Response $response, $args) // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'view_user_field', [ 'user' => $user, - 'property' => 'permissions' + 'property' => 'permissions', ])) { throw new ForbiddenException(); } @@ -844,9 +895,11 @@ public function getPermissions(Request $request, Response $response, $args) * * This page requires authentication. * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If user is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -874,7 +927,7 @@ public function getRoles(Request $request, Response $response, $args) // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'view_user_field', [ 'user' => $user, - 'property' => 'roles' + 'property' => 'roles', ])) { throw new ForbiddenException(); } @@ -898,9 +951,11 @@ public function getRoles(Request $request, Response $response, $args) * * This page requires authentication. * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function pageInfo(Request $request, Response $response, $args) @@ -920,7 +975,7 @@ public function pageInfo(Request $request, Response $response, $args) // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'uri_user', [ - 'user' => $user + 'user' => $user, ])) { throw new ForbiddenException(); } @@ -937,91 +992,96 @@ public function pageInfo(Request $request, Response $response, $args) // Generate form $fields = [ // Always hide these - 'hidden' => ['theme'] + 'hidden' => ['theme'], ]; // Determine which fields should be hidden foreach ($fieldNames as $field) { if (!$authorizer->checkAccess($currentUser, 'view_user_field', [ 'user' => $user, - 'property' => $field + 'property' => $field, ])) { $fields['hidden'][] = $field; } } + // Hide the locale field if there is only 1 locale available + if (count($config->getDefined('site.locales.available')) <= 1) { + $fields['hidden'][] = 'locale'; + } + // Determine buttons to display $editButtons = [ - 'hidden' => [] + 'hidden' => [], ]; if (!$authorizer->checkAccess($currentUser, 'update_user_field', [ 'user' => $user, - 'fields' => ['name', 'email', 'locale'] + 'fields' => ['name', 'email', 'locale'], ])) { $editButtons['hidden'][] = 'edit'; } if (!$authorizer->checkAccess($currentUser, 'update_user_field', [ 'user' => $user, - 'fields' => ['flag_enabled'] + 'fields' => ['flag_enabled'], ])) { $editButtons['hidden'][] = 'enable'; } if (!$authorizer->checkAccess($currentUser, 'update_user_field', [ 'user' => $user, - 'fields' => ['flag_verified'] + 'fields' => ['flag_verified'], ])) { $editButtons['hidden'][] = 'activate'; } if (!$authorizer->checkAccess($currentUser, 'update_user_field', [ 'user' => $user, - 'fields' => ['password'] + 'fields' => ['password'], ])) { $editButtons['hidden'][] = 'password'; } if (!$authorizer->checkAccess($currentUser, 'update_user_field', [ 'user' => $user, - 'fields' => ['roles'] + 'fields' => ['roles'], ])) { $editButtons['hidden'][] = 'roles'; } if (!$authorizer->checkAccess($currentUser, 'delete_user', [ - 'user' => $user + 'user' => $user, ])) { $editButtons['hidden'][] = 'delete'; } // Determine widgets to display $widgets = [ - 'hidden' => [] + 'hidden' => [], ]; if (!$authorizer->checkAccess($currentUser, 'view_user_field', [ 'user' => $user, - 'property' => 'permissions' + 'property' => 'permissions', ])) { $widgets['hidden'][] = 'permissions'; } if (!$authorizer->checkAccess($currentUser, 'view_user_field', [ 'user' => $user, - 'property' => 'activities' + 'property' => 'activities', ])) { $widgets['hidden'][] = 'activities'; } return $this->ci->view->render($response, 'pages/user.html.twig', [ - 'user' => $user, - 'locales' => $locales, - 'fields' => $fields, - 'tools' => $editButtons, - 'widgets' => $widgets, - 'delete_redirect' => $this->ci->router->pathFor('uri_users') + 'user' => $user, + 'locales' => $locales, + 'fields' => $fields, + 'tools' => $editButtons, + 'widgets' => $widgets, + 'delete_redirect' => $this->ci->router->pathFor('uri_users'), ]); } @@ -1033,9 +1093,11 @@ public function pageInfo(Request $request, Response $response, $args) * * This page requires authentication. * Request type: GET - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws ForbiddenException If user is not authozied to access page */ public function pageList(Request $request, Response $response, $args) @@ -1055,7 +1117,7 @@ public function pageList(Request $request, Response $response, $args) } /** - * Processes the request to update an existing user's basic details (first_name, last_name, email, locale, group_id) + * Processes the request to update an existing user's basic details (first_name, last_name, email, locale, group_id). * * Processes the request from the user update form, checking that: * 1. The target user's new email address, if specified, is not already in use; @@ -1064,9 +1126,11 @@ public function pageList(Request $request, Response $response, $args) * * This route requires authentication. * Request type: PUT - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If user is not found * @throws ForbiddenException If user is not authozied to access page */ @@ -1125,7 +1189,7 @@ public function updateInfo(Request $request, Response $response, $args) // Access-controlled resource - check that currentUser has permission to edit submitted fields for this user if (!$authorizer->checkAccess($currentUser, 'update_user_field', [ 'user' => $user, - 'fields' => array_values(array_unique($fieldNames)) + 'fields' => array_values(array_unique($fieldNames)), ])) { throw new ForbiddenException(); } @@ -1145,7 +1209,7 @@ public function updateInfo(Request $request, Response $response, $args) if ( isset($data['email']) && $data['email'] != $user->email && - $classMapper->staticMethod('user', 'findUnique', $data['email'], 'email') + $classMapper->getClassMapping('user')::findUnique($data['email'], 'email') ) { $ms->addMessageTranslated('danger', 'EMAIL.IN_USE', $data); $error = true; @@ -1169,12 +1233,12 @@ public function updateInfo(Request $request, Response $response, $args) // Create activity record $this->ci->userActivityLogger->info("User {$currentUser->user_name} updated basic account info for user {$user->user_name}.", [ 'type' => 'account_update_info', - 'user_id' => $currentUser->id + 'user_id' => $currentUser->id, ]); }); $ms->addMessageTranslated('success', 'DETAILS_UPDATED', [ - 'user_name' => $user->user_name + 'user_name' => $user->user_name, ]); return $response->withJson([], 200); @@ -1191,9 +1255,11 @@ public function updateInfo(Request $request, Response $response, $args) * * This route requires authentication. * Request type: PUT - * @param Request $request - * @param Response $response - * @param array $args + * + * @param Request $request + * @param Response $response + * @param array $args + * * @throws NotFoundException If user is not found * @throws ForbiddenException If user is not authozied to access page * @throws BadRequestException @@ -1219,7 +1285,7 @@ public function updateField(Request $request, Response $response, $args) // Access-controlled resource - check that currentUser has permission to edit the specified field for this user if (!$authorizer->checkAccess($currentUser, 'update_user_field', [ 'user' => $user, - 'fields' => [$fieldName] + 'fields' => [$fieldName], ])) { throw new ForbiddenException(); } @@ -1244,11 +1310,13 @@ public function updateField(Request $request, Response $response, $args) // Create and validate key -> value pair $params = [ - $fieldName => $put['value'] + $fieldName => $put['value'], ]; // Load the request schema $schema = new RequestSchema('schema://requests/user/edit-field.yaml'); + $schema->set('password.validators.length.min', $config['site.password.length.min']); + $schema->set('password.validators.length.max', $config['site.password.length.max']); // Whitelist and set parameter defaults $transformer = new RequestDataTransformer($schema); @@ -1264,6 +1332,7 @@ public function updateField(Request $request, Response $response, $args) $e->addUserMessage($error); } } + throw $e; } @@ -1282,6 +1351,7 @@ public function updateField(Request $request, Response $response, $args) ) { $e = new BadRequestException(); $e->addUserMessage('DISABLE_MASTER'); + throw $e; } elseif ( ($user->id == $currentUser->id) && @@ -1289,6 +1359,7 @@ public function updateField(Request $request, Response $response, $args) ) { $e = new BadRequestException(); $e->addUserMessage('DISABLE_SELF'); + throw $e; } } elseif ($fieldName == 'password') { @@ -1308,7 +1379,7 @@ public function updateField(Request $request, Response $response, $args) // Create activity record $this->ci->userActivityLogger->info("User {$currentUser->user_name} updated property '$fieldName' for user {$user->user_name}.", [ 'type' => 'account_update_field', - 'user_id' => $currentUser->id + 'user_id' => $currentUser->id, ]); }); @@ -1316,20 +1387,20 @@ public function updateField(Request $request, Response $response, $args) if ($fieldName == 'flag_enabled') { if ($fieldValue == '1') { $ms->addMessageTranslated('success', 'ENABLE_SUCCESSFUL', [ - 'user_name' => $user->user_name + 'user_name' => $user->user_name, ]); } else { $ms->addMessageTranslated('success', 'DISABLE_SUCCESSFUL', [ - 'user_name' => $user->user_name + 'user_name' => $user->user_name, ]); } } elseif ($fieldName == 'flag_verified') { $ms->addMessageTranslated('success', 'MANUALLY_ACTIVATED', [ - 'user_name' => $user->user_name + 'user_name' => $user->user_name, ]); } else { $ms->addMessageTranslated('success', 'DETAILS_UPDATED', [ - 'user_name' => $user->user_name + 'user_name' => $user->user_name, ]); } @@ -1337,10 +1408,12 @@ public function updateField(Request $request, Response $response, $args) } /** - * Get User instance from params + * Get User instance from params. + * + * @param array $params * - * @param array $params * @throws BadRequestException + * * @return User */ protected function getUserFromParams($params) @@ -1362,6 +1435,7 @@ protected function getUserFromParams($params) $e->addUserMessage($error); } } + throw $e; } @@ -1369,7 +1443,8 @@ protected function getUserFromParams($params) $classMapper = $this->ci->classMapper; // Get the user to delete - $user = $classMapper->staticMethod('user', 'where', 'user_name', $data['user_name']) + $user = $classMapper->getClassMapping('user') + ::where('user_name', $data['user_name']) ->first(); return $user; diff --git a/app/sprinkles/admin/src/ServicesProvider/ServicesProvider.php b/app/sprinkles/admin/src/ServicesProvider/ServicesProvider.php index 37411feb1..c453d2c20 100644 --- a/app/sprinkles/admin/src/ServicesProvider/ServicesProvider.php +++ b/app/sprinkles/admin/src/ServicesProvider/ServicesProvider.php @@ -1,5 +1,6 @@ classMapper->staticMethod('permission', 'find', $this->options['permission_id']); + $permission = $this->classMapper->getClassMapping('permission')::find($this->options['permission_id']); // If the permission doesn't exist, return 404 if (!$permission) { diff --git a/app/sprinkles/admin/src/Sprunje/RoleSprunje.php b/app/sprinkles/admin/src/Sprunje/RoleSprunje.php index cdce42f8f..8eee87fbe 100644 --- a/app/sprinkles/admin/src/Sprunje/RoleSprunje.php +++ b/app/sprinkles/admin/src/Sprunje/RoleSprunje.php @@ -1,5 +1,6 @@ classMapper->staticMethod('user', 'find', $this->options['user_id']); + $user = $this->classMapper->getClassMapping('user')::find($this->options['user_id']); // If the user doesn't exist, return 404 if (!$user) { diff --git a/app/sprinkles/admin/src/Sprunje/UserSprunje.php b/app/sprinkles/admin/src/Sprunje/UserSprunje.php index 038247a2a..7a0d70c79 100644 --- a/app/sprinkles/admin/src/Sprunje/UserSprunje.php +++ b/app/sprinkles/admin/src/Sprunje/UserSprunje.php @@ -1,5 +1,6 @@ 'active', - 'text' => Translator::translate('ACTIVE') + 'text' => Translator::translate('ACTIVE'), ], [ 'value' => 'unactivated', - 'text' => Translator::translate('UNACTIVATED') + 'text' => Translator::translate('UNACTIVATED'), ], [ 'value' => 'disabled', - 'text' => Translator::translate('DISABLED') - ] + 'text' => Translator::translate('DISABLED'), + ], ]; } /** * Sort based on last activity time. * - * @param Builder $query - * @param string $direction + * @param Builder $query + * @param string $direction + * * @return self */ protected function sortLastActivity($query, $direction) @@ -165,8 +170,9 @@ protected function sortLastActivity($query, $direction) /** * Sort based on last name. * - * @param Builder $query - * @param string $direction + * @param Builder $query + * @param string $direction + * * @return self */ protected function sortName($query, $direction) @@ -177,10 +183,11 @@ protected function sortName($query, $direction) } /** - * Sort active, unactivated, disabled + * Sort active, unactivated, disabled. + * + * @param Builder $query + * @param string $direction * - * @param Builder $query - * @param string $direction * @return self */ protected function sortStatus($query, $direction) diff --git a/app/sprinkles/admin/templates/modals/user-set-password.html.twig b/app/sprinkles/admin/templates/modals/user-set-password.html.twig index d067bcb03..525cf5320 100644 --- a/app/sprinkles/admin/templates/modals/user-set-password.html.twig +++ b/app/sprinkles/admin/templates/modals/user-set-password.html.twig @@ -32,7 +32,7 @@
          - +
          diff --git a/app/sprinkles/admin/tests/Integration/Controller/ActivityControllerTest.php b/app/sprinkles/admin/tests/Integration/Controller/ActivityControllerTest.php new file mode 100644 index 000000000..a2d99dbd4 --- /dev/null +++ b/app/sprinkles/admin/tests/Integration/Controller/ActivityControllerTest.php @@ -0,0 +1,120 @@ +getController(); + $this->assertInstanceOf(ActivityController::class, $controller); + + return $controller; + } + + /** + * @depends testControllerConstructor + * @expectedException \UserFrosting\Support\Exception\ForbiddenException + */ + public function testGetList_GuestUser() + { + $controller = $this->getController(); + $this->expectException(ForbiddenException::class); + $controller->getList($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructor + */ + public function testGetList_ForbiddenException() + { + // Non admin user, won't have access + $testUser = $this->createTestUser(false, true); + + // Get controller + $controller = $this->getController(); + $this->expectException(ForbiddenException::class); + $controller->getList($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructor + */ + public function testGetList() + { + // Admin user, WILL have access + $testUser = $this->createTestUser(true, true); + + // Get controller + $controller = $this->getController(); + + $result = $controller->getList($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotSame('[]', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + */ + public function testPageList() + { + // Admin user, WILL have access + $testUser = $this->createTestUser(true, true); + + // Get controller + $controller = $this->getController(); + + // Get controller stuff + $result = $controller->pageList($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructor + */ + public function testPageListWithNoPermission() + { + // Admin user, WILL have access + $testUser = $this->createTestUser(false, true); + + // Get controller + $controller = $this->getController(); + + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute + $controller->pageList($this->getRequest(), $this->getResponse(), []); + } + + /** + * @return ActivityController + */ + private function getController() + { + return new ActivityController($this->ci); + } +} diff --git a/app/sprinkles/admin/tests/Integration/AdminControllerTest.php b/app/sprinkles/admin/tests/Integration/Controller/AdminControllerTest.php similarity index 63% rename from app/sprinkles/admin/tests/Integration/AdminControllerTest.php rename to app/sprinkles/admin/tests/Integration/Controller/AdminControllerTest.php index 5cb4db334..db3cd2328 100644 --- a/app/sprinkles/admin/tests/Integration/AdminControllerTest.php +++ b/app/sprinkles/admin/tests/Integration/Controller/AdminControllerTest.php @@ -1,5 +1,6 @@ getController(); + $this->expectException(ForbiddenException::class); $controller->pageDashboard($this->getRequest(), $this->getResponse(), []); } /** * @depends testControllerConstructor - * @expectedException \UserFrosting\Support\Exception\ForbiddenException */ public function testPageDashboard_ForbiddenException() { @@ -52,6 +53,7 @@ public function testPageDashboard_ForbiddenException() // Get controller $controller = $this->getController(); + $this->expectException(ForbiddenException::class); $controller->pageDashboard($this->getRequest(), $this->getResponse(), []); } @@ -102,12 +104,65 @@ public function testClearCache() /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ $ms = $this->ci->alerts; $messages = $ms->getAndClearMessages(); - $expectedMessage = end($messages)['message']; + $actualMessage = end($messages)['message']; - $actualMessage = $this->ci->translator->translate('CACHE.CLEARED'); + $expectedMessage = $this->ci->translator->translate('CACHE.CLEARED'); $this->assertSame($expectedMessage, $actualMessage); } + /** + * @depends testControllerConstructor + */ + public function testClearCacheWithNoPermission() + { + // Normal user, WON'T have access + $testUser = $this->createTestUser(false, true); + + // Get controller + $controller = $this->getController(); + + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute + $controller->clearCache($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testClearCache + */ + public function testGetModalConfirmClearCache() + { + // Admin user, WILL have access + $testUser = $this->createTestUser(true, true); + + // Get controller + $controller = $this->getController(); + + // Get controller stuff + $result = $controller->getModalConfirmClearCache($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testGetModalConfirmClearCache + */ + public function testGetModalConfirmClearCacheWithNoPermission() + { + // Admin user, WILL have access + $testUser = $this->createTestUser(false, true); + + // Get controller + $controller = $this->getController(); + + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute + $controller->getModalConfirmClearCache($this->getRequest(), $this->getResponse(), []); + } + /** * @return AdminController */ diff --git a/app/sprinkles/admin/tests/Integration/Controller/GroupControllerGuestTest.php b/app/sprinkles/admin/tests/Integration/Controller/GroupControllerGuestTest.php new file mode 100644 index 000000000..51b39b503 --- /dev/null +++ b/app/sprinkles/admin/tests/Integration/Controller/GroupControllerGuestTest.php @@ -0,0 +1,403 @@ +setupTestDatabase(); + + if ($this->usingInMemoryDatabase()) { + + // Setup database, then setup User & default role + $this->refreshDatabase(); + $this->setupUser(); + } elseif (!static::$initialized) { + + // Only refresh db once + $this->refreshDatabase(); + static::$initialized = true; + } + } + + public function testControllerConstructor() + { + $controller = $this->getController(); + $this->assertInstanceOf(GroupController::class, $controller); + } + + /** + * @return GroupController + */ + public function testControllerConstructorWithUser() + { + // Skip user setup if using in-memory db + if (!$this->usingInMemoryDatabase()) { + $this->setupUser(); + } + + $controller = $this->getController(); + $this->assertInstanceOf(GroupController::class, $controller); + + return $controller; + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetInfo_GuestUser(GroupController $controller) + { + $controller = $this->getController(); + $this->expectException(ForbiddenException::class); + $controller->getInfo($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetInfo_ForbiddenException(GroupController $controller) + { + // Non admin user, won't have access + $testUser = $this->createTestUser(false, true); + + // Get controller + $controller = $this->getController(); + $this->expectException(ForbiddenException::class); + $controller->getInfo($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetListWithNoPermission(GroupController $controller) + { + // Admin user, WILL have access + $testUser = $this->createTestUser(false, true); + + // Get controller + $controller = $this->getController(); + + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute + $controller->getList($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetUsersWithNoPermission(GroupController $controller) + { + // Admin user, WILL have access + $testUser = $this->createTestUser(false, true); + + // Create test group + $fm = $this->ci->factory; + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Get controller + $controller = $this->getController(); + + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute + $controller->getUsers($this->getRequest(), $this->getResponse(), ['slug' => $group->slug]); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testpageInfoWithNoPermission(GroupController $controller) + { + // Admin user, WILL have access + $testUser = $this->createTestUser(false, true); + + // Create test group + $fm = $this->ci->factory; + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Get controller + $controller = $this->getController(); + + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute + $controller->pageInfo($this->getRequest(), $this->getResponse(), ['slug' => $group->slug]); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testpageInfoWithPartialPermissions(GroupController $controller) + { + // Guest user + $testUser = $this->createTestUser(false, true); + + // Create test group + $fm = $this->ci->factory; + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Give user partial permissions + $this->giveUserTestPermission($testUser, 'uri_group'); // Can view, but can't edit or delete + + // Get controller + $controller = $this->getController(); + + // Get controller stuff + $result = $controller->pageInfo($this->getRequest(), $this->getResponse(), ['slug' => $group->slug]); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + + // Can't test edit / delete button not displayed ? + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testpageListWithNoPermission(GroupController $controller) + { + // Guest user, WILL have access + $testUser = $this->createTestUser(false, true); + + // Get controller + $controller = $this->getController(); + + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute + $controller->pageList($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testCreateWithNoPermission(GroupController $controller) + { + // Guest user, WILL have access + $testUser = $this->createTestUser(false, true); + + // Get controller + $controller = $this->getController(); + + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute + $controller->create($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @todo test individual permission with the delete_group permission too + * @param GroupController $controller + */ + public function testDeleteWithNoPermission(GroupController $controller) + { + // Guest user, WILL have access + $testUser = $this->createTestUser(false, true); + + // Create test group + $fm = $this->ci->factory; + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Get controller + $controller = $this->getController(); + + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute + $controller->delete($this->getRequest(), $this->getResponse(), ['slug' => $group->slug]); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetModalConfirmDeleteWithNoPermission(GroupController $controller) + { + // Guest user, WILL have access + $testUser = $this->createTestUser(false, true); + + // Create test group + $fm = $this->ci->factory; + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Get controller + $controller = $this->getController(); + + $request = $this->getRequest()->withQueryParams([ + 'slug' => $group->slug, + ]); + + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute + $controller->getModalConfirmDelete($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetModalCreateWithNoPermission(GroupController $controller) + { + // Guest user, WILL have access + $testUser = $this->createTestUser(false, true); + + // Get controller + $controller = $this->getController(); + + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute + $controller->getModalCreate($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetModalEditWithNoPermission(GroupController $controller) + { + // Guest user, WILL have access + $testUser = $this->createTestUser(false, true); + + // Create test group + $fm = $this->ci->factory; + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Get controller + $controller = $this->getController(); + + $request = $this->getRequest()->withQueryParams([ + 'slug' => $group->slug, + ]); + + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute + $controller->getModalEdit($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testUpdateInfoWithNoPermission(GroupController $controller) + { + // Guest user, won't have access + $testUser = $this->createTestUser(false, true); + + // Create a group + $fm = $this->ci->factory; + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Get controller + $controller = $this->getController(); + + // Set post data + $data = [ + 'name' => 'foo', + 'slug' => 'foo', + 'icon' => 'foo', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute + $controller->updateInfo($request, $this->getResponse(), ['slug' => $group->slug]); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testUpdateInfoWithNoGroup(GroupController $controller) + { + // Guest user, WILL have access + $testUser = $this->createTestUser(false, true); + + // Get controller + $controller = $this->getController(); + + // Set expectations + $this->expectException(NotFoundException::class); + + // Execute + $controller->updateInfo($this->getRequest(), $this->getResponse(), ['slug' => 'blah']); + } + + /** + * @return GroupController + */ + private function getController() + { + return new GroupController($this->ci); + } + + private function setupUser() + { + // Guest user, won't have any access + $testUser = $this->createTestUser(false, true); + + // Create test role + $fm = $this->ci->factory; + $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group', [ + 'slug' => 'foo', + 'name' => 'bar', + ]); + } +} diff --git a/app/sprinkles/admin/tests/Integration/Controller/GroupControllerTest.php b/app/sprinkles/admin/tests/Integration/Controller/GroupControllerTest.php new file mode 100644 index 000000000..0faf9cb30 --- /dev/null +++ b/app/sprinkles/admin/tests/Integration/Controller/GroupControllerTest.php @@ -0,0 +1,695 @@ +setupTestDatabase(); + + if ($this->usingInMemoryDatabase()) { + + // Setup database, then setup User & default role + $this->refreshDatabase(); + $this->setupUser(); + } elseif (!static::$initialized) { + + // Only refresh db once + $this->refreshDatabase(); + static::$initialized = true; + } + } + + public function testControllerConstructor() + { + $controller = $this->getController(); + $this->assertInstanceOf(GroupController::class, $controller); + } + + /** + * @return GroupController + */ + public function testControllerConstructorWithUser() + { + // Skip user setup if using in-memory db + if (!$this->usingInMemoryDatabase()) { + $this->setupUser(); + } + + $controller = $this->getController(); + $this->assertInstanceOf(GroupController::class, $controller); + + return $controller; + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetInfoWithNotFoundException(GroupController $controller) + { + $this->expectException(NotFoundException::class); + $controller->getInfo($this->getRequest(), $this->getResponse(), ['slug' => '']); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetInfo(GroupController $controller) + { + $result = $controller->getInfo($this->getRequest(), $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + $this->assertContains('bar', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetList(GroupController $controller) + { + $result = $controller->getList($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetUsersWithBadSlug(GroupController $controller) + { + $this->expectException(NotFoundException::class); + $controller->getUsers($this->getRequest(), $this->getResponse(), ['slug' => 'foobar']); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetUsersWithNoSlug(GroupController $controller) + { + $this->expectException(BadRequestException::class); + $controller->getUsers($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetUsers(GroupController $controller) + { + $result = $controller->getUsers($this->getRequest(), $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testpageInfo(GroupController $controller) + { + $result = $controller->pageInfo($this->getRequest(), $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testpageInfoWithBadSlug(GroupController $controller) + { + $this->expectException(NotFoundException::class); + $controller->pageInfo($this->getRequest(), $this->getResponse(), ['slug' => 'foobar']); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testpageList(GroupController $controller) + { + $result = $controller->pageList($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testCreate(GroupController $controller) + { + // Set post data + $data = [ + 'name' => 'foo', + 'slug' => 'bar', + 'icon' => 'icon', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->create($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure group was created + $group = Group::where('slug', 'bar')->first(); + $this->assertSame('foo', $group->name); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testCreate + * @param GroupController $controller + */ + public function testCreateWithMissingName(GroupController $controller) + { + // Set post data + $data = [ + 'name' => '', + 'slug' => 'missingName', + 'icon' => 'foo', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->create($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure group was created + $group = Group::where('slug', 'missingName')->first(); + $this->assertNull($group); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testCreate + * @param GroupController $controller + */ + public function testCreateWithDuplicateSlug(GroupController $controller) + { + // Set post data + $data = [ + 'name' => 'bar', + 'slug' => 'foo', + 'icon' => 'foo', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->create($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testCreate + * @param GroupController $controller + */ + public function testCreateWithDuplicateName(GroupController $controller) + { + // Set post data + $data = [ + 'name' => 'bar', + 'slug' => 'duplicateName', + 'icon' => 'foo', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->create($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure group was created + $group = Group::where('slug', 'duplicateName')->first(); + $this->assertNull($group); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testDelete(GroupController $controller) + { + // Create test group + $fm = $this->ci->factory; + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Get controller stuff + $result = $controller->delete($this->getRequest(), $this->getResponse(), ['slug' => $group->slug]); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Group is deleted + $this->assertNull(Group::where('slug', $group->slug)->first()); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testDelete + * @param GroupController $controller + */ + public function testDeleteWithNotExistingGroup(GroupController $controller) + { + $this->expectException(NotFoundException::class); + $controller->delete($this->getRequest(), $this->getResponse(), ['slug' => 'foobar']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testDelete + * @param GroupController $controller + */ + public function testDeleteWithDefaultGroup(GroupController $controller) + { + // Admin user, WILL have access + $testUser = User::find(1)->first(); + $this->loginUser($testUser); + + // Change config + $this->ci->config['site.registration.user_defaults.group'] = 'foo'; + + // Recreate controller so config is accepted + $controller = $this->getController(); + + // Make sure group exist + $this->assertNotNull(Group::where('slug', 'foo')->first()); + + // Assert + $this->expectException(BadRequestException::class); + $controller->delete($this->getRequest(), $this->getResponse(), ['slug' => 'foo']); + + // Make sure group is still there + $this->assertNotNull(Group::where('slug', 'foo')->first()); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testDeleteWithDefaultGroup + * @param GroupController $controller + */ + public function testDeleteWithUserInGroup(GroupController $controller) + { + $testUser = User::find(1)->first(); + + // Create test group + $fm = $this->ci->factory; + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Associate user to group + $testUser->group()->associate($group); + $testUser->save(); + + $this->expectException(BadRequestException::class); + $controller->delete($this->getRequest(), $this->getResponse(), ['slug' => $group->slug]); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testDeleteWithUserInGroup + * @param GroupController $controller + */ + public function testGetModalConfirmDelete(GroupController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'slug' => 'foo', + ]); + + // Get controller stuff + $result = $controller->getModalConfirmDelete($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalConfirmDelete + * @param GroupController $controller + */ + public function testGetModalConfirmDeleteWithNoGetData(GroupController $controller) + { + $this->expectException(BadRequestException::class); + $controller->getModalConfirmDelete($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalConfirmDelete + * @param GroupController $controller + */ + public function testGetModalConfirmDeleteWithNonExistingGroup(GroupController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'slug' => 'foobar', + ]); + + $this->expectException(NotFoundException::class); + $controller->getModalConfirmDelete($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalConfirmDelete + * @param GroupController $controller + */ + public function testGetModalConfirmDeleteWithUserInGroup(GroupController $controller) + { + $testUser = User::find(1)->first(); + + // Create test group + $fm = $this->ci->factory; + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Associate user to group + $testUser->group()->associate($group); + $testUser->save(); + + $request = $this->getRequest()->withQueryParams([ + 'slug' => $group->slug, + ]); + + $this->expectException(BadRequestException::class); + $controller->getModalConfirmDelete($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetModalCreate(GroupController $controller) + { + $result = $controller->getModalCreate($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testGetModalEdit(GroupController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'slug' => 'foo', + ]); + + // Get controller stuff + $result = $controller->getModalEdit($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalEdit + * @param GroupController $controller + */ + public function testGetModalEditWithNoGetData(GroupController $controller) + { + $this->expectException(BadRequestException::class); + $controller->getModalEdit($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalEdit + * @param GroupController $controller + */ + public function testGetModalEditWithNonExistingGroup(GroupController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'slug' => 'foobar', + ]); + + $this->expectException(NotFoundException::class); + $controller->getModalEdit($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param GroupController $controller + */ + public function testUpdateInfo(GroupController $controller) + { + // Create a group + $fm = $this->ci->factory; + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group', [ + 'name' => 'barbar', + 'slug' => 'foofoo', + ]); + + // Set post data + $data = [ + 'name' => 'barbarbar', + 'slug' => 'foofoo', + 'icon' => 'icon', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['slug' => $group->slug]); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure group was update + $editedGroup = Group::where('slug', 'foofoo')->first(); + $this->assertSame('barbarbar', $editedGroup->name); + $this->assertNotSame($group->name, $editedGroup->name); + $this->assertSame($group->description, $editedGroup->description); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateInfo + * @param GroupController $controller + */ + public function testUpdateInfoWithMissingName(GroupController $controller) + { + // Set post data + $data = [ + 'name' => '', + 'slug' => 'foo', + 'icon' => 'foo', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure group was NOT update + $editedGroup = Group::where('slug', 'foo')->first(); + $this->assertSame('bar', $editedGroup->name); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateInfo + * @param GroupController $controller + */ + public function testUpdateInfoWithMissingSlug(GroupController $controller) + { + // Set post data + $data = [ + 'name' => 'bar', + 'slug' => '', + 'icon' => 'foo', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure group was NOT update + $editedGroup = Group::where('slug', 'foo')->first(); + $this->assertNotNull($editedGroup); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateInfo + * @param GroupController $controller + */ + public function testUpdateInfoWithDuplicateSlug(GroupController $controller) + { + // Create a group + $fm = $this->ci->factory; + $group2 = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Set post data + $data = [ + 'slug' => $group2->slug, + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateInfo + * @param GroupController $controller + */ + public function testUpdateInfoWithDuplicateName(GroupController $controller) + { + // Create a group + $fm = $this->ci->factory; + $group2 = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Set post data + $data = [ + 'name' => $group2->name, + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @return GroupController + */ + private function getController() + { + return new GroupController($this->ci); + } + + private function setupUser() + { + // Admin user, WILL have access + $testUser = $this->createTestUser(true, true); + + // Create test role + $fm = $this->ci->factory; + $role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group', [ + 'slug' => 'foo', + 'name' => 'bar', + ]); + } +} diff --git a/app/sprinkles/admin/tests/Integration/Controller/PermissionControllerGuestTest.php b/app/sprinkles/admin/tests/Integration/Controller/PermissionControllerGuestTest.php new file mode 100644 index 000000000..2e674fd22 --- /dev/null +++ b/app/sprinkles/admin/tests/Integration/Controller/PermissionControllerGuestTest.php @@ -0,0 +1,152 @@ +setupTestDatabase(); + + if ($this->usingInMemoryDatabase()) { + + // Setup database, then setup User & default role + $this->refreshDatabase(); + $this->setupUser(); + } elseif (!static::$initialized) { + + // Only refresh db once + $this->refreshDatabase(); + static::$initialized = true; + } + } + + public function testControllerConstructor() + { + $controller = $this->getController(); + $this->assertInstanceOf(PermissionController::class, $controller); + } + + /** + * @depends testControllerConstructor + * @return PermissionController + */ + public function testControllerConstructorWithUser() + { + // Skip user setup if using in-memory db + if (!$this->usingInMemoryDatabase()) { + $this->setupUser(); + } + + $controller = $this->getController(); + $this->assertInstanceOf(PermissionController::class, $controller); + + return $controller; + } + + /** + * @depends testControllerConstructorWithUser + */ + public function testGetInfo_GuestUser() + { + $controller = $this->getController(); + $this->expectException(ForbiddenException::class); + $controller->getInfo($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param PermissionController $controller + */ + public function testGetInfo_ForbiddenException(PermissionController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->getInfo($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param PermissionController $controller + */ + public function testGetListWithNoPermission(PermissionController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->getList($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param PermissionController $controller + */ + public function testGetUsersWithNoPermission(PermissionController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->getUsers($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param PermissionController $controller + */ + public function testpageInfoWithNoPermission(PermissionController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->pageInfo($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param PermissionController $controller + */ + public function testpageListWithNoPermission(PermissionController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->pageList($this->getRequest(), $this->getResponse(), []); + } + + /** + * @return PermissionController + */ + private function getController() + { + return new PermissionController($this->ci); + } + + private function setupUser() + { + $this->createTestUser(false, true); + } +} diff --git a/app/sprinkles/admin/tests/Integration/Controller/PermissionControllerTest.php b/app/sprinkles/admin/tests/Integration/Controller/PermissionControllerTest.php new file mode 100644 index 000000000..eafd72863 --- /dev/null +++ b/app/sprinkles/admin/tests/Integration/Controller/PermissionControllerTest.php @@ -0,0 +1,184 @@ +setupTestDatabase(); + + if ($this->usingInMemoryDatabase()) { + + // Setup database, then setup User & default role + $this->refreshDatabase(); + $this->setupUser(); + } elseif (!static::$initialized) { + + // Only refresh db once + $this->refreshDatabase(); + static::$initialized = true; + } + } + + public function testControllerConstructor() + { + $controller = $this->getController(); + $this->assertInstanceOf(PermissionController::class, $controller); + } + + /** + * @depends testControllerConstructor + * @return PermissionController + */ + public function testControllerConstructorWithUser() + { + // Skip user setup if using in-memory db + if (!$this->usingInMemoryDatabase()) { + $this->setupUser(); + } + + $controller = $this->getController(); + $this->assertInstanceOf(PermissionController::class, $controller); + + return $controller; + } + + /** + * @depends testControllerConstructorWithUser + * @param PermissionController $controller + */ + public function testGetInfoWithNotFoundException(PermissionController $controller) + { + $this->expectException(NotFoundException::class); + $controller->getInfo($this->getRequest(), $this->getResponse(), ['id' => 0]); + } + + /** + * @depends testControllerConstructorWithUser + * @param PermissionController $controller + */ + public function testGetInfo(PermissionController $controller) + { + $result = $controller->getInfo($this->getRequest(), $this->getResponse(), ['id' => self::$permissionID]); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + $this->assertContains('bar', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param PermissionController $controller + */ + public function testGetList(PermissionController $controller) + { + $result = $controller->getList($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param PermissionController $controller + */ + public function testGetUsers(PermissionController $controller) + { + $result = $controller->getUsers($this->getRequest(), $this->getResponse(), ['id' => self::$permissionID]); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param PermissionController $controller + */ + public function testpageInfo(PermissionController $controller) + { + $result = $controller->pageInfo($this->getRequest(), $this->getResponse(), ['id' => self::$permissionID]); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param PermissionController $controller + */ + public function testpageInfoWithNotFoundPermission(PermissionController $controller) + { + $this->expectException(NotFoundException::class); + $controller->pageInfo($this->getRequest(), $this->getResponse(), ['id' => 0]); + } + + /** + * @depends testControllerConstructorWithUser + * @param PermissionController $controller + */ + public function testpageList(PermissionController $controller) + { + $result = $controller->pageList($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @return PermissionController + */ + private function getController() + { + return new PermissionController($this->ci); + } + + private function setupUser() + { + // Admin user, WILL have access + $testUser = $this->createTestUser(true, true); + + // Create test Permission + $fm = $this->ci->factory; + $permission = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Permission', [ + 'slug' => 'foo', + 'name' => 'bar', + ]); + + self::$permissionID = $permission->id; + } +} diff --git a/app/sprinkles/admin/tests/Integration/Controller/RoleControllerGuestTest.php b/app/sprinkles/admin/tests/Integration/Controller/RoleControllerGuestTest.php new file mode 100644 index 000000000..c87a75940 --- /dev/null +++ b/app/sprinkles/admin/tests/Integration/Controller/RoleControllerGuestTest.php @@ -0,0 +1,298 @@ +setupTestDatabase(); + + if ($this->usingInMemoryDatabase()) { + + // Setup database, then setup User & default role + $this->refreshDatabase(); + $this->setupUser(); + } elseif (!static::$initialized) { + + // Only refresh db once + $this->refreshDatabase(); + static::$initialized = true; + } + } + + public function testControllerConstructor() + { + $controller = $this->getController(); + $this->assertInstanceOf(RoleController::class, $controller); + } + + /** + * @depends testControllerConstructor + * @return RoleController + */ + public function testControllerConstructorWithUser() + { + // Skip user setup if using in-memory db + if (!$this->usingInMemoryDatabase()) { + $this->setupUser(); + } + + $controller = $this->getController(); + $this->assertInstanceOf(RoleController::class, $controller); + + return $controller; + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testCreateWithNoPermission(RoleController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->create($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @todo test individual permissions too + * @param RoleController $controller + */ + public function testDeleteWithNoPermission(RoleController $controller) + { + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute. Foo has already been set by testCreate + $controller->delete($this->getRequest(), $this->getResponse(), ['slug' => 'foo']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetInfoWithGuestUser(RoleController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->getInfo($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetListWithNoPermission(RoleController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->getList($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetModalConfirmDeleteWithNoPermission(RoleController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'slug' => 'foo', + ]); + + $this->expectException(ForbiddenException::class); + $controller->getModalConfirmDelete($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetModalCreateWithNoPermission(RoleController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->getModalCreate($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetModalEditWithNoPermission(RoleController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'slug' => 'foo', + ]); + + $this->expectException(ForbiddenException::class); + $controller->getModalEdit($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetModalEditPermissionsWithNoPermission(RoleController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'slug' => 'foo', + ]); + + $this->expectException(ForbiddenException::class); + $controller->getModalEditPermissions($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetPermissionsWithNoPermission(RoleController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->getPermissions($this->getRequest(), $this->getResponse(), ['slug' => 'foo']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testUpdateFieldWithNoPermission(RoleController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->updateField($this->getRequest(), $this->getResponse(), ['slug' => 'foo', 'field' => 'name']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetUsersWithNoPermission(RoleController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->getUsers($this->getRequest(), $this->getResponse(), ['slug' => 'foo']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testpageInfoWithNoPermission(RoleController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->pageInfo($this->getRequest(), $this->getResponse(), ['slug' => 'foo']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testpageInfoWithPartialPermissions(RoleController $controller) + { + // Give user partial permissions + $testUser = $this->createTestUser(false, true); + $this->giveUserTestPermission($testUser, 'uri_role'); // Can view, but can't edit or delete + + // Get a new controller with this user + $controller = $this->getController(); + + // Get controller stuff + $result = $controller->pageInfo($this->getRequest(), $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + + // Can't test edit / delete button not displayed ? + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testpageListWithNoPermission(RoleController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->pageList($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testUpdateInfoWithNoPermission(RoleController $controller) + { + // Set post data + $data = [ + 'name' => 'foo', + 'slug' => 'foo', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Set expectations + $this->expectException(ForbiddenException::class); + + // Execute + $controller->updateInfo($request, $this->getResponse(), ['slug' => 'foo']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testUpdateInfoWithNoRole(RoleController $controller) + { + $this->expectException(NotFoundException::class); + $controller->updateInfo($this->getRequest(), $this->getResponse(), ['slug' => 'blah']); + } + + /** + * @return RoleController + */ + private function getController() + { + return new RoleController($this->ci); + } + + private function setupUser() + { + // Guest user, won't have any access + $testUser = $this->createTestUser(false, true); + + // Create test role + $fm = $this->ci->factory; + $role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role', [ + 'slug' => 'foo', + 'name' => 'bar', + ]); + } +} diff --git a/app/sprinkles/admin/tests/Integration/Controller/RoleControllerTest.php b/app/sprinkles/admin/tests/Integration/Controller/RoleControllerTest.php new file mode 100644 index 000000000..eebcd1a0c --- /dev/null +++ b/app/sprinkles/admin/tests/Integration/Controller/RoleControllerTest.php @@ -0,0 +1,886 @@ +setupTestDatabase(); + + if ($this->usingInMemoryDatabase()) { + + // Setup database, then setup User & default role + $this->refreshDatabase(); + $this->setupUser(); + } elseif (!static::$initialized) { + + // Only refresh db once + $this->refreshDatabase(); + static::$initialized = true; + } + } + + public function testControllerConstructor() + { + $controller = $this->getController(); + $this->assertInstanceOf(RoleController::class, $controller); + } + + /** + * @depends testControllerConstructor + * @return RoleController + */ + public function testControllerConstructorWithUser() + { + // Skip user setup if using in-memory db + if (!$this->usingInMemoryDatabase()) { + $this->setupUser(); + } + + $controller = $this->getController(); + $this->assertInstanceOf(RoleController::class, $controller); + + return $controller; + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testCreate(RoleController $controller) + { + // Set post data + $data = [ + 'name' => 'foo', + 'slug' => 'bar', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->create($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure role was created + $role = Role::where('slug', 'bar')->first(); + $this->assertSame('foo', $role->name); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testCreateWithMissingName(RoleController $controller) + { + // Set post data + $data = [ + 'name' => '', + 'slug' => 'foo', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->create($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testCreateWithDuplicateSlug(RoleController $controller) + { + // Set post data. Foo has already been set by testCreate + $data = [ + 'name' => 'bar', + 'slug' => 'foo', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->create($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testCreateWithDuplicateName(RoleController $controller) + { + // Set post data. Bar has already been set by testCreate + $data = [ + 'name' => 'bar', + 'slug' => 'foo', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->create($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testDelete(RoleController $controller) + { + // Create test role + $fm = $this->ci->factory; + $role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role'); + + // Get controller stuff + $result = $controller->delete($this->getRequest(), $this->getResponse(), ['slug' => $role->slug]); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // role is deleted + $this->assertNull(Role::where('slug', $role->slug)->first()); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testDelete + * @param RoleController $controller + */ + public function testDeleteWithNotExistingRole(RoleController $controller) + { + // Set expectations + $this->expectException(NotFoundException::class); + + // Execute + $controller->delete($this->getRequest(), $this->getResponse(), ['slug' => 'foobar']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testDelete + * @param RoleController $controller + */ + public function testDeleteWithDefaultRole(RoleController $controller) + { + // Change config + $this->ci->config['site.registration.user_defaults.roles'] = ['foo' => true]; + + $this->expectException(BadRequestException::class); + $controller->delete($this->getRequest(), $this->getResponse(), ['slug' => 'foo']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testDelete + * @param RoleController $controller + */ + public function testDeleteWithUserInRole(RoleController $controller) + { + $testUser = User::find(1)->first(); + + // Create a role + $fm = $this->ci->factory; + $role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role'); + + // Associate user to role + $testUser->roles()->attach($role); + $testUser->save(); + + $this->expectException(BadRequestException::class); + $controller->delete($this->getRequest(), $this->getResponse(), ['slug' => $role->slug]); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetInfoWithNotFoundException(RoleController $controller) + { + $this->expectException(NotFoundException::class); + $controller->getInfo($this->getRequest(), $this->getResponse(), ['slug' => '']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetInfo(RoleController $controller) + { + $result = $controller->getInfo($this->getRequest(), $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + $this->assertContains('bar', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetList(RoleController $controller) + { + $result = $controller->getList($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetModalConfirmDelete(RoleController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'slug' => 'foo', + ]); + + // Get controller stuff + $result = $controller->getModalConfirmDelete($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalConfirmDelete + * @param RoleController $controller + */ + public function testGetModalConfirmDeleteWithNoGetData(RoleController $controller) + { + $this->expectException(BadRequestException::class); + $controller->getModalConfirmDelete($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalConfirmDelete + * @param RoleController $controller + */ + public function testGetModalConfirmDeleteWithNonExistingRole(RoleController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'slug' => 'foobar', + ]); + + $this->expectException(NotFoundException::class); + $controller->getModalConfirmDelete($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalConfirmDelete + * @param RoleController $controller + */ + public function testGetModalConfirmDeleteWithUserInRole(RoleController $controller) + { + $testUser = User::find(1)->first(); + + // Create test role + $fm = $this->ci->factory; + $role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role'); + + // Associate user to role + $testUser->roles()->attach($role); + $testUser->save(); + + $request = $this->getRequest()->withQueryParams([ + 'slug' => $role->slug, + ]); + + $this->expectException(BadRequestException::class); + $controller->getModalConfirmDelete($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalConfirmDelete + * @param RoleController $controller + */ + public function testGetModalConfirmDeleteWithDefaultRole(RoleController $controller) + { + // Change config + $this->ci->config['site.registration.user_defaults.roles'] = ['foo' => true]; + + $request = $this->getRequest()->withQueryParams([ + 'slug' => 'foo', + ]); + + // Set expectations + $this->expectException(BadRequestException::class); + + // Execute + $controller->getModalConfirmDelete($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetModalCreate(RoleController $controller) + { + $result = $controller->getModalCreate($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetModalEdit(RoleController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'slug' => 'foo', + ]); + + // Get controller stuff + $result = $controller->getModalEdit($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalEdit + * @param RoleController $controller + */ + public function testGetModalEditWithNoGetData(RoleController $controller) + { + $this->expectException(BadRequestException::class); + $controller->getModalEdit($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalEdit + * @param RoleController $controller + */ + public function testGetModalEditWithNonExistingRole(RoleController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'slug' => 'foobar', + ]); + + $this->expectException(NotFoundException::class); + $controller->getModalEdit($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetUsersWithBadSlug(RoleController $controller) + { + $this->expectException(NotFoundException::class); + $controller->getUsers($this->getRequest(), $this->getResponse(), ['slug' => 'foobar']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetUsersWithNoSlug(RoleController $controller) + { + $this->expectException(BadRequestException::class); + $controller->getUsers($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetUsers(RoleController $controller) + { + $result = $controller->getUsers($this->getRequest(), $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testpageInfo(RoleController $controller) + { + $result = $controller->pageInfo($this->getRequest(), $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testpageInfoWithBadSlug(RoleController $controller) + { + $this->expectException(NotFoundException::class); + $controller->pageInfo($this->getRequest(), $this->getResponse(), ['slug' => 'foobar']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testpageList(RoleController $controller) + { + $result = $controller->pageList($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testUpdateInfo(RoleController $controller) + { + // Create a role + $fm = $this->ci->factory; + $role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role', [ + 'name' => 'barbar', + 'slug' => 'foofoo', + ]); + + // Set post data + $data = [ + 'name' => 'foofoo', + 'slug' => 'foofoo', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['slug' => $role->slug]); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure role was update + $editedRole = Role::where('slug', 'foofoo')->first(); + $this->assertSame('foofoo', $editedRole->name); + $this->assertNotSame('barbar', $editedRole->name); + $this->assertSame($role->description, $editedRole->description); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateInfo + * @param RoleController $controller + */ + public function testUpdateInfoWithMissingName(RoleController $controller) + { + // Set post data + $data = [ + 'name' => '', + 'slug' => 'foo', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure role was NOT update + $editedRole = Role::where('slug', 'foo')->first(); + $this->assertSame('bar', $editedRole->name); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateInfo + * @param RoleController $controller + */ + public function testUpdateInfoWithMissingSlug(RoleController $controller) + { + // Set post data + $data = [ + 'name' => 'bar', + 'slug' => '', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure role was NOT update + $editedRole = Role::where('slug', 'foo')->first(); + $this->assertNotNull($editedRole); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateInfo + * @param RoleController $controller + */ + public function testUpdateInfoWithDuplicateSlug(RoleController $controller) + { + // Create a role + $fm = $this->ci->factory; + $role2 = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role'); + + // Set post data + $data = [ + 'slug' => $role2->slug, + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateInfo + * @param RoleController $controller + */ + public function testUpdateInfoWithDuplicateName(RoleController $controller) + { + // Create a role + $fm = $this->ci->factory; + $role2 = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role'); + + // Set post data + $data = [ + 'name' => $role2->name, + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetModalEditPermissions(RoleController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'slug' => 'foo', + ]); + + // Get controller stuff + $result = $controller->getModalEditPermissions($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalEditPermissions + * @param RoleController $controller + */ + public function testGetModalEditPermissionsWithNoGetData(RoleController $controller) + { + $this->expectException(BadRequestException::class); + $controller->getModalEditPermissions($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalEditPermissions + * @param RoleController $controller + */ + public function testGetModalEditPermissionsWithNonExistingRole(RoleController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'slug' => 'foobar', + ]); + + $this->expectException(NotFoundException::class); + $controller->getModalEditPermissions($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testGetPermissions(RoleController $controller) + { + $result = $controller->getPermissions($this->getRequest(), $this->getResponse(), ['slug' => 'foo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetPermissions + * @param RoleController $controller + */ + public function testGetPermissionsWithNoArgs(RoleController $controller) + { + $this->expectException(BadRequestException::class); + $controller->getPermissions($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetPermissions + * @param RoleController $controller + */ + public function testGetPermissionsWithNonExistingRole(RoleController $controller) + { + $this->expectException(NotFoundException::class); + $controller->getPermissions($this->getRequest(), $this->getResponse(), ['slug' => 'foobar']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testupdateField(RoleController $controller) + { + // Create a role + $fm = $this->ci->factory; + $role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role', [ + 'name' => 'bar123', + 'slug' => 'foo123', + ]); + + // Set post data + $data = [ + 'value' => 'foo123', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateField($request, $this->getResponse(), ['slug' => $role->slug, 'field' => 'name']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure role was update + $editedRole = Role::where('slug', 'foo123')->first(); + $this->assertSame('foo123', $editedRole->name); + $this->assertNotSame('bar123', $editedRole->name); + $this->assertSame($role->description, $editedRole->description); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testupdateFieldWithNonExistingRole(RoleController $controller) + { + $this->expectException(NotFoundException::class); + $controller->updateField($this->getRequest(), $this->getResponse(), ['slug' => 'foobar']); + } + + /** + * @depends testControllerConstructorWithUser + * @param RoleController $controller + */ + public function testupdateFieldNoValue(RoleController $controller) + { + $this->expectException(BadRequestException::class); + $controller->updateField($this->getRequest(), $this->getResponse(), ['slug' => 'foo', 'field' => 'name']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testupdateField + * @param RoleController $controller + */ + public function testupdateFieldWithFailedValidation(RoleController $controller) + { + // Create a string wich will be too long for validation + $faker = Faker::getGenerator(); + $value = $faker->text(500); + + // Set post data + $data = [ + 'value' => $value, + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $this->expectException(BadRequestException::class); + $controller->updateField($request, $this->getResponse(), ['slug' => 'foo', 'field' => 'name']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testupdateField + * @param RoleController $controller + */ + public function testupdateFieldWithPermissionField(RoleController $controller) + { + // Create a role + $fm = $this->ci->factory; + $permission = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Permission'); + + // Expected input : + // value[0][permission_id]: 2 + // value[1][permission_id]: 9 + + // Set post data + $data = [ + 'value' => [['permission_id' => $permission->id]], + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Check the default role has how many permisions + $role = Role::where('slug', 'foo')->first(); + $this->assertEmpty($role->permissions); + + // Get controller stuff + $result = $controller->updateField($request, $this->getResponse(), ['slug' => 'foo', 'field' => 'permissions']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure role permisions was updated + $role = Role::where('slug', 'foo')->first(); + $this->assertCount(1, $role->permissions); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @return RoleController + */ + private function getController() + { + return new RoleController($this->ci); + } + + private function setupUser() + { + // Admin user, WILL have access + $testUser = $this->createTestUser(true, true); + + // Create test role + $fm = $this->ci->factory; + $role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role', [ + 'slug' => 'foo', + 'name' => 'bar', + ]); + } +} diff --git a/app/sprinkles/admin/tests/Integration/Controller/UserControllerCreateTest.php b/app/sprinkles/admin/tests/Integration/Controller/UserControllerCreateTest.php new file mode 100644 index 000000000..36608ea85 --- /dev/null +++ b/app/sprinkles/admin/tests/Integration/Controller/UserControllerCreateTest.php @@ -0,0 +1,171 @@ +setupTestDatabase(); + $this->refreshDatabase(); + } + + public function tearDown() + { + parent::tearDown(); + m::close(); + } + + public function testCreate() + { + $fm = $this->ci->factory; + + // Create fake mailer + $mailer = m::mock(Mailer::class); + $mailer->shouldReceive('send')->once()->with(\Mockery::type(TwigMailMessage::class)); + $this->ci->mailer = $mailer; + + // Create will fail on PGSQL if a user is created with forced id + // because it mess the auto_increment + // @see https://stackoverflow.com/questions/36157029/laravel-5-2-eloquent-save-auto-increment-pgsql-exception-on-same-id + $user = $fm->create(User::class); + $this->giveUserTestPermission($user, 'create_user'); + $this->giveUserTestPermission($user, 'create_user_field'); + $this->loginUser($user); + + // Recreate controller to use the fake mailer + $controller = $this->getController(); + + // Create a fake group + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Set post data + $data = [ + 'user_name' => 'foo', + 'first_name' => 'foo name', + 'last_name' => 'foo last', + 'email' => 'foo@bar.com', + 'group_id' => $group->id, + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->create($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure role was created + $user = User::where('user_name', 'foo')->first(); + $this->assertSame('foo name', $user->first_name); + $this->assertSame($group->id, $user->group->id); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testCreate + */ + public function testCreateWithNoLocale() + { + $this->ci->config['site.locales.available'] = []; + $this->testCreate(); + } + + /** + * @depends testCreate + */ + public function testCreateWithNoGroupId() + { + $fm = $this->ci->factory; + + // Create fake mailer + $mailer = m::mock(Mailer::class); + $mailer->shouldReceive('send')->once()->with(\Mockery::type(TwigMailMessage::class)); + $this->ci->mailer = $mailer; + + // Also create a group + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Create will fail on PGSQL if a user is created with forced id + // because it mess the auto_increment + // @see https://stackoverflow.com/questions/36157029/laravel-5-2-eloquent-save-auto-increment-pgsql-exception-on-same-id + $user = $fm->create(User::class, [ + 'group_id' => $group->id, + ]); + $this->giveUserTestPermission($user, 'create_user'); + $this->loginUser($user); + + // Recreate controller to use the fake mailer + $controller = $this->getController(); + + // Set post data + $data = [ + 'user_name' => 'foo', + 'first_name' => 'foo name', + 'last_name' => 'foo last', + 'email' => 'foo@bar.com', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->create($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure role was created + $user = User::where('user_name', 'foo')->first(); + $this->assertSame('foo name', $user->first_name); + $this->assertSame($group->id, $user->group->id); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @return UserController + */ + private function getController() + { + return new UserController($this->ci); + } +} diff --git a/app/sprinkles/admin/tests/Integration/Controller/UserControllerGuestTest.php b/app/sprinkles/admin/tests/Integration/Controller/UserControllerGuestTest.php new file mode 100644 index 000000000..208eca890 --- /dev/null +++ b/app/sprinkles/admin/tests/Integration/Controller/UserControllerGuestTest.php @@ -0,0 +1,769 @@ +setupTestDatabase(); + + if ($this->usingInMemoryDatabase()) { + + // Setup database, then setup User & default role + $this->refreshDatabase(); + $this->setupUser(); + } elseif (!static::$initialized) { + + // Only refresh db once + $this->refreshDatabase(); + static::$initialized = true; + } + } + + public function tearDown() + { + parent::tearDown(); + m::close(); + } + + public function testControllerConstructor() + { + $controller = $this->getController(); + $this->assertInstanceOf(UserController::class, $controller); + } + + /** + * @depends testControllerConstructor + * @return UserController + */ + public function testControllerConstructorWithUser() + { + // Skip user setup if using in-memory db + if (!$this->usingInMemoryDatabase()) { + $this->setupUser(); + } + + $controller = $this->getController(); + $this->assertInstanceOf(UserController::class, $controller); + + return $controller; + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testCreateWithNoPermissions(UserController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->create($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + */ + public function testCreateWithNoGroupPermissions() + { + $user = $this->createTestUser(false, true); + $this->giveUserTestPermission($user, 'create_user'); + + // Recreate controller to use new user + $controller = $this->getController(); + + // Create a fake group + $fm = $this->ci->factory; + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Set post data + $data = [ + 'user_name' => 'foo', + 'first_name' => 'foo name', + 'last_name' => 'foo last', + 'email' => 'foo@bar.com', + 'group_id' => $group->id, + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $this->expectException(ForbiddenException::class); + $result = $controller->create($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testCreatePasswordResetWithNoPermissions(UserController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->createPasswordReset($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testCreatePasswordResetWithNoPermissions + * @param UserController $controller + */ + public function testCreatePasswordResetWithPartialPermissions(UserController $controller) + { + // Create fake mailer + $mailer = m::mock(Mailer::class); + $mailer->shouldReceive('send')->once()->with(\Mockery::type(TwigMailMessage::class)); + $this->ci->mailer = $mailer; + + // Recreate controller to use the fake mailer + $user = $this->createTestUser(false, true); + $this->giveUserTestPermission($user, 'update_user_field'); + $controller = $this->getController(); + + // Get controller stuff + $result = $controller->createPasswordReset($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testDeleteWithNoPermission(UserController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->delete($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetActivitiesWithNoPermission(UserController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->getActivities($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetActivitiesWithPartialPermission(UserController $controller) + { + // Guest user + $testUser = $this->createTestUser(false, true); + + // Give user partial permissions + $this->giveUserTestPermission($testUser, 'view_user_field'); + + // Get new controller to propagate new user + $controller = $this->getController(); + + $result = $controller->getActivities($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetInfoWithNoPermission(UserController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->getInfo($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetInfoWithPartialPermission(UserController $controller) + { + // Guest user + $testUser = $this->createTestUser(false, true); + + // Give user partial permissions + $this->giveUserTestPermission($testUser, 'uri_user'); + + // Get new controller to propagate new user + $controller = $this->getController(); + + $result = $controller->getInfo($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetListWithNoPermission(UserController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->getList($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalConfirmDeleteWithNoPermission(UserController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'userfoo', + ]); + + $this->expectException(ForbiddenException::class); + $controller->getModalConfirmDelete($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalCreateWithNoPermission(UserController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'userfoo', + ]); + + $this->expectException(ForbiddenException::class); + $controller->getModalCreate($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalCreateWithNoUserGroup(UserController $controller) + { + // Guest user + $testUser = $this->createTestUser(false, true); + + // Give user partial permissions + $this->giveUserTestPermission($testUser, 'create_user'); + + // Get new controller to propagate new user + $controller = $this->getController(); + + $result = $controller->getModalCreate($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalEditWithNoPermissions(UserController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'userfoo', + ]); + + $this->expectException(ForbiddenException::class); + $controller->getModalEdit($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalEditWithPartialPermissions(UserController $controller) + { + // Guest user + $testUser = $this->createTestUser(false, true); + + // Give user partial permissions + $this->giveUserTestPermission($testUser, 'update_user_field'); + + // Get new controller to propagate new user + $controller = $this->getController(); + + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'userfoo', + ]); + + $result = $controller->getModalEdit($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalEditWithNoGroupPermissions(UserController $controller) + { + // Guest user + $testUser = $this->createTestUser(false, true); + + // Give user partial permissions + $this->giveUserTestPermission($testUser, 'update_user_field', "subset(fields,['name','email','locale','flag_enabled','flag_verified','password'])"); + + // Get new controller to propagate new user + $controller = $this->getController(); + + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'userfoo', + ]); + + $result = $controller->getModalEdit($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalEditPasswordWithNoPermissions(UserController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'userfoo', + ]); + + $this->expectException(ForbiddenException::class); + $controller->getModalEditPassword($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalEditPasswordWithPartialPermissions(UserController $controller) + { + // Guest user + $testUser = $this->createTestUser(false, true); + + // Give user partial permissions + $this->giveUserTestPermission($testUser, 'update_user_field'); + + // Get new controller to propagate new user + $controller = $this->getController(); + + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'userfoo', + ]); + + $result = $controller->getModalEditPassword($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalEditRolesWithNoPermission(UserController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'userfoo', + ]); + + $this->expectException(ForbiddenException::class); + $controller->getModalEditRoles($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetPermissionsWithNoPermissions(UserController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->getPermissions($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetPermissionsWithPartialPermissions(UserController $controller) + { + // Guest user + $testUser = $this->createTestUser(false, true); + + // Give user partial permissions + $this->giveUserTestPermission($testUser, 'view_user_field'); + + // Get new controller to propagate new user + $controller = $this->getController(); + + $result = $controller->getPermissions($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetRolesWithNoPermissions(UserController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->getRoles($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetRolesWithPartialPermissions(UserController $controller) + { + // Guest user + $testUser = $this->createTestUser(false, true); + + // Give user partial permissions + $this->giveUserTestPermission($testUser, 'view_user_field'); + + // Get new controller to propagate new user + $controller = $this->getController(); + + $result = $controller->getRoles($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testPageInfoWithNoPermissions(UserController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->pageInfo($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testPageInfoWithPartialPermissions(UserController $controller) + { + // Guest user + $testUser = $this->createTestUser(false, true); + + // Give user partial permissions + $this->giveUserTestPermission($testUser, 'uri_user'); + + // Get new controller to propagate new user + $controller = $this->getController(); + + $result = $controller->pageInfo($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testPageListWithNoPermission(UserController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->pageList($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testUpdateInfoWithNoPermissions(UserController $controller) + { + // Create a user + $fm = $this->ci->factory; + $user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [ + 'user_name' => 'testUpdateInfoWithNoPermissions', + 'first_name' => 'foo', + ]); + + // Set post data + $data = [ + 'first_name' => 'bar', + ]; + $request = $this->getRequest()->withParsedBody($data); + + $this->expectException(ForbiddenException::class); + $controller->updateInfo($request, $this->getResponse(), ['user_name' => $user->user_name]); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testUpdateInfoWithPartialPermissions(UserController $controller) + { + // Guest user + $testUser = $this->createTestUser(false, true); + + // Give user partial permissions + $this->giveUserTestPermission($testUser, 'update_user_field'); + + // Get new controller to propagate new user + $controller = $this->getController(); + + // Create a user + $fm = $this->ci->factory; + $user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [ + 'user_name' => 'testUpdateInfoWithPartialPermissions', + 'first_name' => 'foo', + ]); + + // Also create a group + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Set post data + $data = [ + 'first_name' => 'bar', + 'group_id' => $group->id, + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['user_name' => $user->user_name]); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was update + $editedUser = User::where('user_name', $user->user_name)->first(); + $this->assertSame('bar', $editedUser->first_name); + $this->assertNotSame($user->first_name, $editedUser->first_name); + $this->assertSame($user->last_name, $editedUser->last_name); + $this->assertSame($group->id, $editedUser->group->id); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testUpdateInfoForMasterUserWithNoPermissions(UserController $controller) + { + // Guest user + $testUser = $this->createTestUser(false, true); + + // Give user partial permissions + $this->giveUserTestPermission($testUser, 'update_user_field'); + + // Get new controller to propagate new user + $controller = $this->getController(); + + // Default should be the existing admin user. + $user = User::find($this->ci->config['reserved_user_ids.master']); + + // In case the user don't exist + if (!$user) { + $fm = $this->ci->factory; + $user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [ + 'id' => $this->ci->config['reserved_user_ids.master'], + ]); + } + + // Set post data + $data = [ + 'first_name' => 'bar', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $this->expectException(ForbiddenException::class); + $controller->updateInfo($request, $this->getResponse(), ['user_name' => $user->user_name]); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testUpdateFieldWithNoPermissions(UserController $controller) + { + $this->expectException(ForbiddenException::class); + $controller->updateField($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo', 'field' => 'first_name']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testUpdateFieldWithPartialPermissions(UserController $controller) + { + // Guest user + $testUser = $this->createTestUser(false, true); + + // Give user partial permissions + $this->giveUserTestPermission($testUser, 'update_user_field'); + + // Get new controller to propagate new user + $controller = $this->getController(); + + // Create a user + $fm = $this->ci->factory; + $user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [ + 'user_name' => 'testUpdateFieldWithPartialPermissions', + 'first_name' => 'foo', + ]); + + // Set post data + $data = [ + 'value' => 'bar', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateField($request, $this->getResponse(), ['user_name' => $user->user_name, 'field' => 'first_name']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was update + $editedUser = User::where('user_name', $user->user_name)->first(); + $this->assertSame('bar', $editedUser->first_name); + $this->assertNotSame($user->first_name, $editedUser->first_name); + $this->assertSame($user->last_name, $editedUser->last_name); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testUpdateFieldWithMasterUserWithNoPermissions(UserController $controller) + { + // Guest user + $testUser = $this->createTestUser(false, true); + + // Give user partial permissions + $this->giveUserTestPermission($testUser, 'update_user_field'); + + // Get new controller to propagate new user + $controller = $this->getController(); + + // Default should be the existing admin user. + $user = User::find($this->ci->config['reserved_user_ids.master']); + + // In case the user don't exist + if (!$user) { + $fm = $this->ci->factory; + $user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [ + 'id' => $this->ci->config['reserved_user_ids.master'], + ]); + } + + // Set post data + $data = [ + 'value' => 'bar', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $this->expectException(ForbiddenException::class); + $controller->updateField($request, $this->getResponse(), ['user_name' => $user->user_name, 'field' => 'first_name']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testUpdateFieldForFlagEnabledWithCurrentUser(UserController $controller) + { + // Guest user + $user = $this->createTestUser(false, true); + + // Give user partial permissions + $this->giveUserTestPermission($user, 'update_user_field'); + + // Get new controller to propagate new user + $controller = $this->getController(); + + // Set post data + $data = [ + 'value' => '0', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $this->expectException(BadRequestException::class); + $controller->updateField($request, $this->getResponse(), ['user_name' => $user->user_name, 'field' => 'flag_enabled']); + } + + /** + * @return UserController + */ + private function getController() + { + return new UserController($this->ci); + } + + private function setupUser() + { + // Admin user, WILL have access + $testUser = $this->createTestUser(false, true); + + // Create test user + $fm = $this->ci->factory; + $user = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\User', [ + 'id' => '9999', + 'user_name' => 'userfoo', + 'email' => 'bar@foo.com', + ]); + } +} diff --git a/app/sprinkles/admin/tests/Integration/Controller/UserControllerTest.php b/app/sprinkles/admin/tests/Integration/Controller/UserControllerTest.php new file mode 100644 index 000000000..dc3fc67a1 --- /dev/null +++ b/app/sprinkles/admin/tests/Integration/Controller/UserControllerTest.php @@ -0,0 +1,1099 @@ +setupTestDatabase(); + + if ($this->usingInMemoryDatabase()) { + + // Setup database, then setup User & default role + $this->refreshDatabase(); + $this->setupUser(); + } elseif (!static::$initialized) { + + // Only refresh db once + $this->refreshDatabase(); + static::$initialized = true; + } + } + + public function tearDown() + { + parent::tearDown(); + m::close(); + } + + public function testControllerConstructor() + { + $controller = $this->getController(); + $this->assertInstanceOf(UserController::class, $controller); + } + + /** + * @depends testControllerConstructor + * @return UserController + */ + public function testControllerConstructorWithUser() + { + // Skip user setup if using in-memory db + if (!$this->usingInMemoryDatabase()) { + $this->setupUser(); + } + + $controller = $this->getController(); + $this->assertInstanceOf(UserController::class, $controller); + + return $controller; + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testCreateWithNoUsername(UserController $controller) + { + // Set post data + $data = [ + //'user_name' => 'foo', + 'first_name' => 'foo name', + 'last_name' => 'foo last', + 'email' => 'foo@bar.com', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->create($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testCreateWithNoEmail(UserController $controller) + { + // Set post data + $data = [ + 'user_name' => 'foo', + 'first_name' => 'foo name', + 'last_name' => 'foo last', + //'email' => 'foo@bar.com' + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->create($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testCreateWithDuplicateUsername(UserController $controller) + { + // Set post data. Foo has already been set by testCreate + $data = [ + 'user_name' => 'userfoo', + 'first_name' => 'foo name', + 'last_name' => 'foo last', + 'email' => 'foo@bar.com', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->create($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testCreateWithDuplicateEmail(UserController $controller) + { + // Set post data. Foo has already been set by testCreate + $data = [ + 'user_name' => 'barbarbar', + 'first_name' => 'foo name', + 'last_name' => 'foo last', + 'email' => 'bar@foo.com', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->create($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + */ + public function testCreatePasswordReset() + { + // Create fake mailer + $mailer = m::mock(Mailer::class); + $mailer->shouldReceive('send')->once()->with(\Mockery::type(TwigMailMessage::class)); + $this->ci->mailer = $mailer; + + // Recreate controller to use the fake mailer + $this->createTestUser(true, true); + $controller = $this->getController(); + + // Get controller stuff + $result = $controller->createPasswordReset($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testCreatePasswordResetWithNotExistingUser(UserController $controller) + { + $this->expectException(NotFoundException::class); + $result = $controller->createPasswordReset($this->getRequest(), $this->getResponse(), ['user_name' => 'potato']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testDelete(UserController $controller) + { + // Create test user + $user = $this->createTestUser(); + + // Get controller stuff + $result = $controller->delete($this->getRequest(), $this->getResponse(), ['user_name' => $user->user_name]); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // role is deleted + $this->assertNull(User::where('id', $user->id)->first()); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testDelete + * @param UserController $controller + */ + public function testDeleteWithNotExistingUser(UserController $controller) + { + $this->expectException(NotFoundException::class); + $controller->delete($this->getRequest(), $this->getResponse(), ['user_name' => 'potato']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testDelete + * @param UserController $controller + */ + public function testDeleteWithReservedIds(UserController $controller) + { + $user = User::find($this->ci->config['reserved_user_ids.master']); + $this->expectException(BadRequestException::class); + $controller->delete($this->getRequest(), $this->getResponse(), ['user_name' => $user->user_name]); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetActivities(UserController $controller) + { + $result = $controller->getActivities($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetActivities + * @param UserController $controller + */ + public function testGetActivitiesWithBadUser(UserController $controller) + { + $this->expectException(NotFoundException::class); + $controller->getActivities($this->getRequest(), $this->getResponse(), ['user_name' => 'potato']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetInfo(UserController $controller) + { + $result = $controller->getInfo($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetInfo + * @param UserController $controller + */ + public function testGetInfoWithBadUser(UserController $controller) + { + $this->expectException(NotFoundException::class); + $controller->getInfo($this->getRequest(), $this->getResponse(), ['user_name' => 'potato']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetList(UserController $controller) + { + $result = $controller->getList($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalConfirmDelete(UserController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'userfoo', + ]); + + // Get controller stuff + $result = $controller->getModalConfirmDelete($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalConfirmDelete + * @param UserController $controller + */ + public function testGetModalConfirmDeleteWithNoUser(UserController $controller) + { + $this->expectException(BadRequestException::class); + $controller->getModalConfirmDelete($this->getRequest(), $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalConfirmDelete + * @param UserController $controller + */ + public function testGetModalConfirmDeleteWithNonExistingUser(UserController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'foobar', + ]); + + $this->expectException(NotFoundException::class); + $controller->getModalConfirmDelete($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalConfirmDelete + * @param UserController $controller + */ + public function testGetModalConfirmDeleteWithReservedId(UserController $controller) + { + $user = User::find($this->ci->config['reserved_user_ids.master']); + + $request = $this->getRequest()->withQueryParams([ + 'user_name' => $user->user_name, + ]); + + $this->expectException(BadRequestException::class); + $controller->getModalConfirmDelete($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalCreate(UserController $controller) + { + $result = $controller->getModalCreate($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalCreate + * @param UserController $controller + */ + public function testGetModalCreateWithNoLocale(UserController $controller) + { + // Change config + $this->ci->config['site.locales.available'] = []; + + // Get new controller to propagate new config + $user = $this->createTestUser(true, true); + $controller = $this->getController(); + + $result = $controller->getModalCreate($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalEdit(UserController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'userfoo', + ]); + + $result = $controller->getModalEdit($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testGetModalEdit + * @param UserController $controller + */ + public function testGetModalEditWithNoLocale(UserController $controller) + { + // Change config + $this->ci->config['site.locales.available'] = []; + + // Get new controller to propagate new config + $user = $this->createTestUser(true, true); + $controller = $this->getController(); + + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'userfoo', + ]); + + $result = $controller->getModalEdit($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalEditWithNoUser(UserController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'foobar', + ]); + + $this->expectException(NotFoundException::class); + $controller->getModalEdit($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalEditPassword(UserController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'userfoo', + ]); + + $result = $controller->getModalEditPassword($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalEditPasswordWithNoUser(UserController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'foobar', + ]); + + $this->expectException(NotFoundException::class); + $controller->getModalEditPassword($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalEditRoles(UserController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'userfoo', + ]); + + $result = $controller->getModalEditRoles($request, $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetModalEditRolesWithNoUser(UserController $controller) + { + $request = $this->getRequest()->withQueryParams([ + 'user_name' => 'foobar', + ]); + + $this->expectException(NotFoundException::class); + $controller->getModalEditRoles($request, $this->getResponse(), []); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetPermissions(UserController $controller) + { + $result = $controller->getPermissions($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetPermissionsWithNoUser(UserController $controller) + { + $this->expectException(NotFoundException::class); + $controller->getPermissions($this->getRequest(), $this->getResponse(), ['user_name' => 'foobar']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetRoles(UserController $controller) + { + $result = $controller->getRoles($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertNotEmpty((string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testGetRolesWithNoUser(UserController $controller) + { + $this->expectException(NotFoundException::class); + $controller->getRoles($this->getRequest(), $this->getResponse(), ['user_name' => 'foobar']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testPageInfo(UserController $controller) + { + $result = $controller->pageInfo($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testPageInfoWithNoLocale(UserController $controller) + { + // Change config + $this->ci->config['site.locales.available'] = []; + + // Get new controller to propagate new config + $user = $this->createTestUser(true, true); + $controller = $this->getController(); + + $result = $controller->pageInfo($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testPageInfoWithNoUser(UserController $controller) + { + $this->expectException(NotFoundException::class); + $controller->pageInfo($this->getRequest(), $this->getResponse(), ['user_name' => 'foobar']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testPageList(UserController $controller) + { + $result = $controller->pageList($this->getRequest(), $this->getResponse(), []); + $this->assertSame($result->getStatusCode(), 200); + $this->assertNotSame('', (string) $result->getBody()); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testUpdateInfo(UserController $controller) + { + // Create a user + $user = $this->createTestUser(); + + // Also create a group + $fm = $this->ci->factory; + $group = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Group'); + + // Set post data + $data = [ + 'first_name' => 'bar', + 'group_id' => $group->id, + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['user_name' => $user->user_name]); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was update + $editedUser = User::where('user_name', $user->user_name)->first(); + $this->assertSame('bar', $editedUser->first_name); + $this->assertNotSame($user->first_name, $editedUser->first_name); + $this->assertSame($user->last_name, $editedUser->last_name); + $this->assertSame($group->id, $editedUser->group->id); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateInfo + * @param UserController $controller + */ + public function testUpdateInfoWithNoUser(UserController $controller) + { + $this->expectException(NotFoundException::class); + $controller->updateInfo($this->getRequest(), $this->getResponse(), ['user_name' => 'foobar']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateInfo + * @param UserController $controller + */ + public function testUpdateInfoWithValidationError(UserController $controller) + { + // Create a string wich will be too long for validation + $faker = Faker::getGenerator(); + $value = $faker->text(100); + + // Set post data + $data = [ + 'first_name' => $value, + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['user_name' => 'userfoo']); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was NOT update + $editedUser = User::where('user_name', 'userfoo')->first(); + $this->assertNotSame($value, $editedUser->first_name); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateInfo + * @param UserController $controller + */ + public function testUpdateInfoWithDuplicateEmail(UserController $controller) + { + // Create a user + $user = $this->createTestUser(); + + // Set post data + $data = [ + 'email' => 'bar@foo.com', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['user_name' => $user->user_name]); + $this->assertSame($result->getStatusCode(), 400); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was NOT update + $editedUser = User::where('user_name', $user->user_name)->first(); + $this->assertNotSame('bar@foo.com', $editedUser->email); + $this->assertSame($user->email, $editedUser->email); + + // Test message + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('danger', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateInfo + * @param UserController $controller + */ + public function testUpdateInfoForMasterUser(UserController $controller) + { + // Default should be the existing admin user. + $user = User::find($this->ci->config['reserved_user_ids.master']); + + // Set post data + $data = [ + 'first_name' => 'bar', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateInfo($request, $this->getResponse(), ['user_name' => $user->user_name]); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was update + $editedUser = User::where('user_name', $user->user_name)->first(); + $this->assertSame('bar', $editedUser->first_name); + $this->assertNotSame($user->first_name, $editedUser->first_name); + $this->assertSame($user->last_name, $editedUser->last_name); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @param UserController $controller + */ + public function testUpdateField(UserController $controller) + { + // Create a user + $user = $this->createTestUser(); + + // Set post data + $data = [ + 'value' => 'bar', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateField($request, $this->getResponse(), ['user_name' => $user->user_name, 'field' => 'first_name']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was update + $editedUser = User::where('user_name', $user->user_name)->first(); + $this->assertSame('bar', $editedUser->first_name); + $this->assertNotSame($user->first_name, $editedUser->first_name); + $this->assertSame($user->last_name, $editedUser->last_name); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateField + * @param UserController $controller + */ + public function testUpdateFieldWithNoUser(UserController $controller) + { + $this->expectException(NotFoundException::class); + $controller->updateField($this->getRequest(), $this->getResponse(), ['user_name' => 'foobar']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateField + * @param UserController $controller + */ + public function testUpdateFieldWithNoUserWithNoValue(UserController $controller) + { + $this->expectException(BadRequestException::class); + $controller->updateField($this->getRequest(), $this->getResponse(), ['user_name' => 'userfoo', 'field' => 'first_name']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateField + * @param UserController $controller + */ + public function testUpdateFieldWithMasterUser(UserController $controller) + { + // Default should be the existing admin user. + $user = User::find($this->ci->config['reserved_user_ids.master']); + + // Set post data + $data = [ + 'value' => 'barbar', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateField($request, $this->getResponse(), ['user_name' => $user->user_name, 'field' => 'first_name']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was update + $editedUser = User::where('user_name', $user->user_name)->first(); + $this->assertSame('barbar', $editedUser->first_name); + $this->assertNotSame($user->first_name, $editedUser->first_name); + $this->assertSame($user->last_name, $editedUser->last_name); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateField + * @param UserController $controller + */ + public function testUpdateFieldWithValidationError(UserController $controller) + { + // Create a string wich will be too long for validation + $faker = Faker::getGenerator(); + $value = $faker->text(100); + + // Set post data + $data = [ + 'value' => $value, + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $this->expectException(BadRequestException::class); + $controller->updateField($request, $this->getResponse(), ['user_name' => 'userfoo', 'field' => 'first_name']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateField + * @param UserController $controller + */ + public function testUpdateFieldForFlagEnabled(UserController $controller) + { + // Set post data + $data = [ + 'value' => '1', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateField($request, $this->getResponse(), ['user_name' => 'userfoo', 'field' => 'flag_enabled']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was update + $editedUser = User::where('user_name', 'userfoo')->first(); + $this->assertSame('1', (string) $editedUser->flag_enabled); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateFieldForFlagEnabled + * @param UserController $controller + */ + public function testUpdateFieldForFlagEnabledDisabled(UserController $controller) + { + // Set post data + $data = [ + 'value' => '0', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateField($request, $this->getResponse(), ['user_name' => 'userfoo', 'field' => 'flag_enabled']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was update + $editedUser = User::where('user_name', 'userfoo')->first(); + $this->assertEquals(0, $editedUser->flag_enabled); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateField + * @param UserController $controller + */ + public function testUpdateFieldForFlagVerified(UserController $controller) + { + // Set post data + $data = [ + 'value' => '1', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateField($request, $this->getResponse(), ['user_name' => 'userfoo', 'field' => 'flag_verified']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was update + $editedUser = User::where('user_name', 'userfoo')->first(); + $this->assertSame('1', (string) $editedUser->flag_verified); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateField + * @param UserController $controller + */ + public function testUpdateFieldForFlagEnabledWithMasterUser(UserController $controller) + { + // Default should be the existing admin user. + $user = User::find($this->ci->config['reserved_user_ids.master']); + + // Set post data + $data = [ + 'value' => '0', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $this->expectException(BadRequestException::class); + $controller->updateField($request, $this->getResponse(), ['user_name' => $user->user_name, 'field' => 'flag_enabled']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateField + * @param UserController $controller + */ + public function testUpdateFieldForPassword(UserController $controller) + { + // Set post data + $data = [ + 'value' => '1234567890abc', + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateField($request, $this->getResponse(), ['user_name' => 'userfoo', 'field' => 'password']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was update + $editedUser = User::where('user_name', 'userfoo')->first(); + $this->assertNotSame('blablabla', $editedUser->password); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @depends testControllerConstructorWithUser + * @depends testUpdateField + * @param UserController $controller + */ + public function testUpdateFieldForRoles(UserController $controller) + { + // Create a user + $fm = $this->ci->factory; + $role = $fm->create('UserFrosting\Sprinkle\Account\Database\Models\Role'); + + // Expected input : + // value[0][role_id]: 2 + // value[1][role_id]: 9 + + // Set post data + $data = [ + 'value' => [['role_id' => $role->id]], + ]; + $request = $this->getRequest()->withParsedBody($data); + + // Get controller stuff + $result = $controller->updateField($request, $this->getResponse(), ['user_name' => 'userfoo', 'field' => 'roles']); + $this->assertSame($result->getStatusCode(), 200); + $this->assertJson((string) $result->getBody()); + $this->assertSame('[]', (string) $result->getBody()); + + // Make sure user was update + $editedUser = User::where('user_name', 'userfoo')->first(); + $this->assertSame($role->id, $editedUser->roles->first()->id); + + // Test message + /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ + $ms = $this->ci->alerts; + $messages = $ms->getAndClearMessages(); + $this->assertSame('success', end($messages)['type']); + } + + /** + * @return UserController + */ + private function getController() + { + return new UserController($this->ci); + } + + private function setupUser() + { + // Admin user, WILL have access + $testUser = $this->createTestUser(true, true); + + // Create test user + $this->createTestUser(false, false, [ + 'user_name' => 'userfoo', + 'email' => 'bar@foo.com', + ]); + } +} diff --git a/app/sprinkles/admin/tests/Integration/SprunjeTests.php b/app/sprinkles/admin/tests/Integration/SprunjeTests.php index ceffb4615..65fc6e2a0 100644 --- a/app/sprinkles/admin/tests/Integration/SprunjeTests.php +++ b/app/sprinkles/admin/tests/Integration/SprunjeTests.php @@ -1,5 +1,6 @@ classMapper, [ - 'user_id' => $users[0]->id + 'user_id' => $users[0]->id, ]); list($count, $countFiltered, $models) = $sprunje->getModels(); @@ -86,7 +87,7 @@ public function testUserPermissionSprunje() // Test user 1 $sprunje = new UserPermissionSprunje($this->classMapper, [ - 'user_id' => $users[1]->id + 'user_id' => $users[1]->id, ]); list($count, $countFiltered, $models) = $sprunje->getModels(); @@ -99,12 +100,12 @@ public function testUserPermissionSprunje() static::ignoreRelations($models); $this->assertCollectionsSame(collect([ $permissions[1], - $permissions[2] + $permissions[2], ]), $models); // Test user 2 $sprunje = new UserPermissionSprunje($this->classMapper, [ - 'user_id' => $users[2]->id + 'user_id' => $users[2]->id, ]); list($count, $countFiltered, $models) = $sprunje->getModels(); @@ -116,7 +117,7 @@ public function testUserPermissionSprunje() // Ignore pivot and roles_via. These are covered by the tests for the relationships themselves. static::ignoreRelations($models); $this->assertCollectionsSame(collect([ - $permissions[2] + $permissions[2], ]), $models); } } diff --git a/app/sprinkles/core/assets/userfrosting/favicons/ieconfig.xml b/app/sprinkles/core/assets/userfrosting/favicons/ieconfig.xml index 21fa5ad8b..e3e3d05d0 100644 --- a/app/sprinkles/core/assets/userfrosting/favicons/ieconfig.xml +++ b/app/sprinkles/core/assets/userfrosting/favicons/ieconfig.xml @@ -1,12 +1,12 @@ - - - - - - - - - #603cba - - - + + + + + + + + + #603cba + + + diff --git a/app/sprinkles/core/assets/userfrosting/images/logo.svg b/app/sprinkles/core/assets/userfrosting/images/logo.svg index b11b0b5cb..148efe6bd 100644 --- a/app/sprinkles/core/assets/userfrosting/images/logo.svg +++ b/app/sprinkles/core/assets/userfrosting/images/logo.svg @@ -1,514 +1,514 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/sprinkles/core/assets/userfrosting/js/uf-tablesorter-parsers.js b/app/sprinkles/core/assets/userfrosting/js/uf-tablesorter-parsers.js index 444b4ac62..0d83c10bf 100755 --- a/app/sprinkles/core/assets/userfrosting/js/uf-tablesorter-parsers.js +++ b/app/sprinkles/core/assets/userfrosting/js/uf-tablesorter-parsers.js @@ -1,53 +1,53 @@ -// Parser for sorting integers, timestamps, etc based on metadata from
          User Last Activity User Last Activity
          attributes -// Adapted from http://mottie.github.io/tablesorter/docs/example-parsers-advanced.html -$.tablesorter.addParser({ - // set a unique id - id: 'metanum', - is: function(s) { - // return false so this parser is not auto detected - return false; - }, - format: function(s, table, cell, cellIndex) { - var $cell = $(cell); - // returns metadata, or cell text (s) if it doesn't exist - return $cell.attr('data-num') || s; - - }, - // set type to numeric - type: 'numeric' -}); - -$.tablesorter.addParser({ - // set a unique id - id: 'metatext', - is: function(s) { - // return false so this parser is not auto detected - return false; - }, - format: function(s, table, cell, cellIndex) { - var $cell = $(cell); - // returns metadata, or cell text (s) if it doesn't exist - return $cell.attr('data-text') || s; - - }, - - type: 'text' -}); - -$.tablesorter.addParser({ - // set a unique id - id: 'isblank', - is: function(s) { - // return false so this parser is not auto detected - return false; - }, - format: function(s, table, cell, cellIndex) { - var $cell = $(cell); - // returns 1 if blank (whitespace), 0 otherwise - var isBlank = $cell.html().trim() == " " ? 1 : 0; - return isBlank; - - }, - - type: 'numeric' -}); +// Parser for sorting integers, timestamps, etc based on metadata from attributes +// Adapted from http://mottie.github.io/tablesorter/docs/example-parsers-advanced.html +$.tablesorter.addParser({ + // set a unique id + id: 'metanum', + is: function(s) { + // return false so this parser is not auto detected + return false; + }, + format: function(s, table, cell, cellIndex) { + var $cell = $(cell); + // returns metadata, or cell text (s) if it doesn't exist + return $cell.attr('data-num') || s; + + }, + // set type to numeric + type: 'numeric' +}); + +$.tablesorter.addParser({ + // set a unique id + id: 'metatext', + is: function(s) { + // return false so this parser is not auto detected + return false; + }, + format: function(s, table, cell, cellIndex) { + var $cell = $(cell); + // returns metadata, or cell text (s) if it doesn't exist + return $cell.attr('data-text') || s; + + }, + + type: 'text' +}); + +$.tablesorter.addParser({ + // set a unique id + id: 'isblank', + is: function(s) { + // return false so this parser is not auto detected + return false; + }, + format: function(s, table, cell, cellIndex) { + var $cell = $(cell); + // returns 1 if blank (whitespace), 0 otherwise + var isBlank = $cell.html().trim() == " " ? 1 : 0; + return isBlank; + + }, + + type: 'numeric' +}); diff --git a/app/sprinkles/core/composer.json b/app/sprinkles/core/composer.json index 6fc01c79f..a44275781 100644 --- a/app/sprinkles/core/composer.json +++ b/app/sprinkles/core/composer.json @@ -15,7 +15,8 @@ }, { "name": "Jordan Mele", - "email": "SiliconSoldier@outlook.com.au" + "email": "SiliconSoldier@outlook.com.au", + "homepage": "https://blog.djmm.me" }, { "name": "Mike Jacobs" @@ -27,10 +28,10 @@ "require": { "doctrine/dbal": "^2.5", "filp/whoops": "^2.3.1", - "illuminate/cache": "5.4.*", - "illuminate/database": "5.4.*", - "illuminate/events": "5.4.*", - "illuminate/filesystem": "5.4.*", + "illuminate/cache": "5.8.*", + "illuminate/database": "5.8.*", + "illuminate/events": "5.8.*", + "illuminate/filesystem": "5.8.*", "league/csv": "^8.1", "league/flysystem": "~1.0", "league/flysystem-aws-s3-v3": "~1.0", @@ -45,12 +46,12 @@ "slim/twig-view": "^1.2", "symfony/http-foundation": "*", "twig/twig": "^1.18", - "userfrosting/assets": "^5.0.0", + "userfrosting/assets": "^5.0.4", "userfrosting/config": "~4.2.0", "userfrosting/cache": "~4.2.0", "userfrosting/fortress": "~4.2.0", "userfrosting/i18n": "~4.2.0", - "userfrosting/session": "~4.2.0", + "userfrosting/session": "~4.2.2", "userfrosting/support": "~4.2.0", "vlucas/phpdotenv": "^2" }, diff --git a/app/sprinkles/core/config/debug.php b/app/sprinkles/core/config/debug.php index 330897072..2f05a776a 100644 --- a/app/sprinkles/core/config/debug.php +++ b/app/sprinkles/core/config/debug.php @@ -1,5 +1,6 @@ [ - 'use_raw' => true + 'use_raw' => true, ], 'cache' => [ - 'twig' => false + 'twig' => false, ], 'debug' => [ 'deprecation' => true, 'queries' => true, 'smtp' => true, - 'twig' => true + 'twig' => true, ], 'settings' => [ - 'displayErrorDetails' => true + 'displayErrorDetails' => true, ], 'site' => [ 'debug' => [ 'ajax' => true, - 'info' => true - ] - ] + 'info' => true, + ], + ], ]; diff --git a/app/sprinkles/core/config/default.php b/app/sprinkles/core/config/default.php index aec6d554e..eedcd73ef 100755 --- a/app/sprinkles/core/config/default.php +++ b/app/sprinkles/core/config/default.php @@ -1,5 +1,6 @@ [ 'admin' => [ 'email' => getenv('SMTP_USER') ?: null, - 'name' => 'Site Administrator' - ] + 'name' => 'Site Administrator', + ], ], /* @@ -51,13 +52,13 @@ 'assets' => [ 'compiled' => [ 'path' => 'assets', - 'schema' => 'bundle.result.json' + 'schema' => 'bundle.result.json', ], 'raw' => [ 'path' => 'assets-raw', - 'schema' => 'asset-bundles.json' + 'schema' => 'asset-bundles.json', ], - 'use_raw' => true + 'use_raw' => true, ], /* @@ -65,7 +66,7 @@ * Cache Service Config * ---------------------------------------------------------------------- * Redis & Memcached driver configuration - * See Laravel for more info : https://laravel.com/docs/5.4/cache + * See Laravel for more info : https://laravel.com/docs/5.8/cache * * Edit prefix to something unique when multiple instance of memcached / * redis are used on the same server. @@ -76,16 +77,16 @@ 'memcached' => [ 'host' => '127.0.0.1', 'port' => 11211, - 'weight' => 100 + 'weight' => 100, ], 'redis' => [ 'host' => '127.0.0.1', 'password' => null, 'port' => 6379, - 'database' => 0 + 'database' => 0, ], // Cache twig file to disk - 'twig' => false + 'twig' => false, ], /* @@ -108,7 +109,7 @@ // Regular expressions will be delimited with ~ in preg_match, so if you // have routes with ~ in them, you must escape this character in your regex. // Also, remember to use ^ when you only want to match the beginning of a URL path! - ] + ], ], /* @@ -119,7 +120,7 @@ * should be store in environment variables * * Multiple connections can also be used. - * See Laravel docs : https://laravel.com/docs/5.4/database + * See Laravel docs : https://laravel.com/docs/5.8/database */ 'db' => [ 'default' => [ @@ -131,8 +132,8 @@ 'password' => getenv('DB_PASSWORD') ?: null, 'charset' => 'utf8', 'collation' => 'utf8_unicode_ci', - 'prefix' => '' - ] + 'prefix' => '', + ], ], /* @@ -145,7 +146,7 @@ 'deprecation' => true, 'queries' => false, 'smtp' => false, - 'twig' => false + 'twig' => false, ], /* @@ -171,7 +172,7 @@ */ 'local' => [ 'driver' => 'local', - 'root' => \UserFrosting\STORAGE_DIR + 'root' => \UserFrosting\STORAGE_DIR, ], /* * Public files are directly accessible throught the webserver for @@ -182,7 +183,7 @@ 'public' => [ 'driver' => 'local', 'root' => \UserFrosting\STORAGE_PUBLIC_DIR, - 'url' => 'files/' + 'url' => 'files/', ], /* * Amazon S3 Bucket Config. Config should go in .env file. For help, see : @@ -210,15 +211,15 @@ 'host' => getenv('SMTP_HOST') ?: null, 'port' => 587, 'auth' => true, - 'secure' => 'tls', + 'secure' => 'tls', // Enable TLS encryption. Set to `tls`, `ssl` or `false` (to disabled) 'username' => getenv('SMTP_USER') ?: null, 'password' => getenv('SMTP_PASSWORD') ?: null, 'smtp_debug' => 4, 'message_options' => [ 'CharSet' => 'UTF-8', 'isHtml' => true, - 'Timeout' => 15 - ] + 'Timeout' => 15, + ], ], /* @@ -228,7 +229,7 @@ * `repository_table` is the table with the list of ran migrations */ 'migrations' => [ - 'repository_table' => 'migrations' + 'repository_table' => 'migrations', ], /* @@ -238,7 +239,7 @@ */ 'path' => [ 'document_root' => str_replace(DIRECTORY_SEPARATOR, \UserFrosting\DS, $_SERVER['DOCUMENT_ROOT']), - 'public_relative' => dirname($_SERVER['SCRIPT_NAME']) // The location of `index.php` relative to the document root. Use for sites installed in subdirectories of your web server's document root. + 'public_relative' => dirname($_SERVER['SCRIPT_NAME']), // The location of `index.php` relative to the document root. Use for sites installed in subdirectories of your web server's document root. ], /* @@ -252,7 +253,7 @@ 'handler' => 'file', // Supported Handler : `file`, `database` or `array` // Config values for when using db-based sessions 'database' => [ - 'table' => 'sessions' + 'table' => 'sessions', ], 'name' => 'uf4', 'minutes' => 120, @@ -260,7 +261,7 @@ // Decouples the session keys used to store certain session info 'keys' => [ 'csrf' => 'site.csrf', // the key (prefix) used to store an ArrayObject of CSRF tokens. - ] + ], ], /* @@ -271,7 +272,7 @@ * Set `displayErrorDetails` to true to display full error details */ 'settings' => [ - 'displayErrorDetails' => true + 'displayErrorDetails' => true, ], /* @@ -284,20 +285,20 @@ // AdminLTE skin color // See https://adminlte.io/themes/AdminLTE/documentation/index.html#layout 'AdminLTE' => [ - 'skin' => 'blue' + 'skin' => 'blue', ], // Google Analytics Settings 'analytics' => [ 'google' => [ 'code' => '', - 'enabled' => false - ] + 'enabled' => false, + ], ], 'author' => 'Author', // Site author 'csrf' => null, // Do not set this variable. The core Twig extension will override it with values from the CSRF service. 'debug' => [ 'ajax' => false, - 'info' => true + 'info' => true, ], 'locales' => [ // Should be ordered according to https://en.wikipedia.org/wiki/List_of_languages_by_total_number_of_speakers, @@ -323,12 +324,12 @@ // First locale is the base one and the other one are loaded on top. // For example, 'en_US,es_ES' will use the English (en_US) // translation as a base and load the Spanish (es_ES) translation on top. - 'default' => 'en_US' + 'default' => 'en_US', ], 'title' => 'UserFrosting', // Site display name // Global ufTable settings 'uf_table' => [ - 'use_loading_transition' => true + 'use_loading_transition' => true, ], // URLs 'uri' => [ @@ -337,11 +338,11 @@ 'host' => isset($_SERVER['SERVER_NAME']) ? trim($_SERVER['SERVER_NAME'], '/') : 'localhost', 'scheme' => empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] === 'off' ? 'http' : 'https', 'port' => isset($_SERVER['SERVER_PORT']) ? (int) $_SERVER['SERVER_PORT'] : null, - 'path' => isset($_SERVER['SCRIPT_NAME']) ? trim(dirname($_SERVER['SCRIPT_NAME']), '/\\') : '' + 'path' => isset($_SERVER['SCRIPT_NAME']) ? trim(dirname($_SERVER['SCRIPT_NAME']), '/\\') : '', ], 'author' => 'https://www.userfrosting.com', - 'publisher' => '' - ] + 'publisher' => '', + ], ], /* @@ -355,6 +356,6 @@ 'display_errors' => 'true', 'log_errors' => 'false', // Let PHP itself render errors natively. Useful if a fatal error is raised in our custom shutdown handler. - 'display_errors_native' => 'false' - ] + 'display_errors_native' => 'false', + ], ]; diff --git a/app/sprinkles/core/config/production.php b/app/sprinkles/core/config/production.php index e3b217bcf..6c57a6757 100644 --- a/app/sprinkles/core/config/production.php +++ b/app/sprinkles/core/config/production.php @@ -1,5 +1,6 @@ [ - 'use_raw' => false + 'use_raw' => false, ], /* * Enable Twig cache */ 'cache' => [ - 'twig' => true + 'twig' => true, ], /* * Turn off debug logs @@ -29,14 +30,14 @@ 'debug' => [ 'twig' => false, 'auth' => false, - 'smtp' => false + 'smtp' => false, ], /* * Use router cache, disable full error details */ 'settings' => [ 'routerCacheFile' => 'routes.cache', - 'displayErrorDetails' => false + 'displayErrorDetails' => false, ], /* * Enable analytics, disable more debugging @@ -44,19 +45,19 @@ 'site' => [ 'analytics' => [ 'google' => [ - 'enabled' => true - ] + 'enabled' => true, + ], ], 'debug' => [ 'ajax' => false, - 'info' => false - ] + 'info' => false, + ], ], /* * Send errors to log */ 'php' => [ 'display_errors' => 'false', - 'log_errors' => 'true' - ] + 'log_errors' => 'true', + ], ]; diff --git a/app/sprinkles/core/config/testing.php b/app/sprinkles/core/config/testing.php index 36e1e24aa..38a87253f 100755 --- a/app/sprinkles/core/config/testing.php +++ b/app/sprinkles/core/config/testing.php @@ -1,5 +1,6 @@ [ 'illuminate' => [ 'default' => 'array', - ] + ], ], /* * Define in memory db for testing @@ -26,7 +27,7 @@ 'test_integration' => [ 'driver' => 'sqlite', 'database' => ':memory:', - ] + ], ], /* * Don't log deprecations in tests @@ -46,26 +47,26 @@ ], 'testingDriver' => [ 'driver' => 'localTest', - 'root' => \UserFrosting\STORAGE_DIR . \UserFrosting\DS . 'testingDriver' + 'root' => \UserFrosting\STORAGE_DIR . \UserFrosting\DS . 'testingDriver', ], - ] + ], ], /* * Don't display error detail in test. Return the non formatted errors */ 'settings' => [ - 'displayErrorDetails' => false + 'displayErrorDetails' => false, ], /* * Disable native sessions in tests */ 'session' => [ - 'handler' => 'array' + 'handler' => getenv('TEST_SESSION_HANDLER') ?: 'array', ], /* * Database to use when using the TestDatabase Trait */ 'testing' => [ - 'dbConnection' => getenv('TEST_DB') ?: 'test_integration' - ] + 'dbConnection' => getenv('TEST_DB') ?: 'test_integration', + ], ]; diff --git a/app/sprinkles/core/defines.php b/app/sprinkles/core/defines.php index 0dc0268a2..4df74c10b 100644 --- a/app/sprinkles/core/defines.php +++ b/app/sprinkles/core/defines.php @@ -1,5 +1,6 @@ ' لا يبدو للعثور على ما كنت تبحث عن', 'DETAIL' => 'حاولنا العثور على صفحتك', 'EXPLAIN' => 'لم نتمكن من العثور على الصفحة التي تبحث عنها', - 'RETURN' => 'وفي كلتا الحالتين، اضغط هنا للعودة إلى الصفحة الأولى' + 'RETURN' => 'وفي كلتا الحالتين، اضغط هنا للعودة إلى الصفحة الأولى', ], 'CONFIG' => [ 'TITLE' => 'مشكلة في تكوين UserFrosting', 'DESCRIPTION' => 'لم تتحقق بعض متطلبات التكوين UserFrosting', 'DETAIL' => 'شيء ليس صحيحا هنا', - 'RETURN' => 'يرجى تصحيح الأخطاء التالية، ثم إعادة تحميل' + 'RETURN' => 'يرجى تصحيح الأخطاء التالية، ثم إعادة تحميل', ], 'DESCRIPTION' => 'لقد لمست اضطراب كبير في الموقع', @@ -47,6 +48,6 @@ 'SERVER' => 'يبدو خادمنا قد أخطأ إذا كنت المسير، يرجى مراجعة سجلات الخطأ PHP أو UF', - 'TITLE' => 'اضطراب في الموقع' - ] + 'TITLE' => 'اضطراب في الموقع', + ], ]; diff --git a/app/sprinkles/core/locale/ar/messages.php b/app/sprinkles/core/locale/ar/messages.php index 706e36832..ec26f6a70 100644 --- a/app/sprinkles/core/locale/ar/messages.php +++ b/app/sprinkles/core/locale/ar/messages.php @@ -1,5 +1,6 @@ 'كلمة التحقق', 'FAIL' => 'لم تقم بإدخال رمز كلمة التحقق بشكل صحيح', 'SPECIFY' => 'أدخل كلمة التحقق', - 'VERIFY' => 'التحقق من كلمة التحقق' + 'VERIFY' => 'التحقق من كلمة التحقق', ], 'CSRF_MISSING' => 'رمز CSRF غير موجود حاول تحديث الصفحة ومن ثم إرساله مرة أخرى', @@ -30,19 +31,19 @@ 'DESCRIPTION' => 'وصف', 'DOWNLOAD' => [ '@TRANSLATION' => 'تحميل', - 'CSV' => 'تحميل CSV' + 'CSV' => 'تحميل CSV', ], 'EMAIL' => [ '@TRANSLATION' => 'البريد الإلكتروني', - 'YOUR' => 'عنوان بريدك الإلكتروني' + 'YOUR' => 'عنوان بريدك الإلكتروني', ], 'HOME' => 'الصفحة الرئيسية', 'LEGAL' => [ '@TRANSLATION' => 'السياسة القانونية', - 'DESCRIPTION' => 'تسري سياستنا القانونية على استخدامك لهذا الموقع وخدماتنا' + 'DESCRIPTION' => 'تسري سياستنا القانونية على استخدامك لهذا الموقع وخدماتنا', ], 'LOCALE' => [ @@ -58,11 +59,11 @@ 'NEXT' => 'الصفحة التالية', 'PREVIOUS' => 'الصفحة السابقة', 'FIRST' => 'الصفحة الأولى', - 'LAST' => 'آخر صفحة' + 'LAST' => 'آخر صفحة', ], 'PRIVACY' => [ '@TRANSLATION' => 'سياسة الخصوصية', - 'DESCRIPTION' => 'تحدد سياسة الخصوصية لدينا نوع المعلومات التي نجمعها منك وكيفية استخدامها.' + 'DESCRIPTION' => 'تحدد سياسة الخصوصية لدينا نوع المعلومات التي نجمعها منك وكيفية استخدامها.', ], 'SLUG' => 'Slug', @@ -109,5 +110,5 @@ // Misc 'BUILT_WITH_UF' => 'بنيت مع UserFrosting', 'ADMINLTE_THEME_BY' => 'فكرة رئيسية Almsaeed Studio كل الحقوق محفوظة', - 'WELCOME_TO' => 'مرحبا بك في {{title}}!' + 'WELCOME_TO' => 'مرحبا بك في {{title}}!', ]; diff --git a/app/sprinkles/core/locale/ar/validate.php b/app/sprinkles/core/locale/ar/validate.php index c85517632..f204e74c3 100644 --- a/app/sprinkles/core/locale/ar/validate.php +++ b/app/sprinkles/core/locale/ar/validate.php @@ -1,5 +1,6 @@ '{{label}} لابد ان تكون بين {{min}} و {{max}} حورف', 'NO_LEAD_WS' => 'القيم ل {{label}} لا يمكن أن تبدأ المساحات، علامات، أو بيضاء أخرى', 'NO_TRAIL_WS' => 'القيم ل {{label}} لا يمكن أن ينتهي مع مسافات، علامات، أو بيضاء أخرى', - 'REQUIRED' => ' تحديد قيمة ل {{label}}' - ] + 'REQUIRED' => ' تحديد قيمة ل {{label}}', + ], ]; diff --git a/app/sprinkles/core/locale/de_DE/errors.php b/app/sprinkles/core/locale/de_DE/errors.php index 5450433f0..fd731280d 100644 --- a/app/sprinkles/core/locale/de_DE/errors.php +++ b/app/sprinkles/core/locale/de_DE/errors.php @@ -1,5 +1,6 @@ 'Die angeforderte Ressource wurde nicht gefunden.', 'DETAIL' => 'Wir haben versucht Ihre Seite zu finden ...', 'EXPLAIN' => 'Die von Ihnen gesuchte Seite konnte nicht gefunden werden.', - 'RETURN' => "Klicken Sie Hier, um zur Startseite zurückzukehren." + 'RETURN' => "Klicken Sie Hier, um zur Startseite zurückzukehren.", ], 'CONFIG' => [ 'TITLE' => 'UserFrosting Konfigurationsproblem!', 'DESCRIPTION' => 'Einige UserFrosting-Konfigurationsanforderungen wurden nicht erfüllt.', 'DETAIL' => 'Etwas stimmt hier nicht.', - 'RETURN' => "Bitte beheben Sie die folgenden Fehler dann laden Sie die Website neu." + 'RETURN' => "Bitte beheben Sie die folgenden Fehler dann laden Sie die Website neu.", ], 'DESCRIPTION' => 'Wir haben eine große Störung in der Macht erkannt.', @@ -49,6 +50,6 @@ 'SERVER' => 'Hoppla, sieht aus als hätte der Server möglicherweise gepatzt. Wenn Sie ein Administrator sind, überprüfen Sie bitte die PHP- oder UF-Fehlerprotokolle.', - 'TITLE' => 'Störung in der Kraft' - ] + 'TITLE' => 'Störung in der Kraft', + ], ]; diff --git a/app/sprinkles/core/locale/de_DE/messages.php b/app/sprinkles/core/locale/de_DE/messages.php index ae79b3083..0a6295366 100644 --- a/app/sprinkles/core/locale/de_DE/messages.php +++ b/app/sprinkles/core/locale/de_DE/messages.php @@ -1,5 +1,6 @@ 'Sicherheitscode', 'FAIL' => 'Sie haben den Sicherheitscode nicht korrekt eingegeben.', 'SPECIFY' => 'Geben Sie den Sicherheitscode ein', - 'VERIFY' => 'Überprüfen Sie den Sicherheitscode' + 'VERIFY' => 'Überprüfen Sie den Sicherheitscode', ], 'CSRF_MISSING' => 'Fehlender CSRF-Token. Versuchen, die Seite zu aktualisieren und erneut zu senden?', @@ -32,23 +33,23 @@ 'DESCRIPTION' => 'Beschreibung', 'DOWNLOAD' => [ '@TRANSLATION' => 'Herunterladen', - 'CSV' => 'CSV herunterladen' + 'CSV' => 'CSV herunterladen', ], 'EMAIL' => [ '@TRANSLATION' => 'E-Mail', - 'YOUR' => 'Ihre E-Mail-Adresse' + 'YOUR' => 'Ihre E-Mail-Adresse', ], 'HOME' => 'Startseite', 'LEGAL' => [ '@TRANSLATION' => 'Rechtsgrundsatz', - 'DESCRIPTION' => 'Unser Rechtsgrundsatz gilt für die Benutzung dieser Internetseite und unserer Dienste.' + 'DESCRIPTION' => 'Unser Rechtsgrundsatz gilt für die Benutzung dieser Internetseite und unserer Dienste.', ], 'LOCALE' => [ - '@TRANSLATION' => 'Sprache' + '@TRANSLATION' => 'Sprache', ], 'NAME' => 'Name', @@ -67,11 +68,11 @@ 'NEXT' => 'Nächste Seite', 'PREVIOUS' => 'Vorherige Seite', 'FIRST' => 'Erste Seite', - 'LAST' => 'Letzte Seite' + 'LAST' => 'Letzte Seite', ], 'PRIVACY' => [ '@TRANSLATION' => 'Datenschutzbestimmungen', - 'DESCRIPTION' => 'In unsere Datenschutzbestimmungen erklären wir Ihnen, welche Daten wir sammeln und wozu wir diese benutzen.' + 'DESCRIPTION' => 'In unsere Datenschutzbestimmungen erklären wir Ihnen, welche Daten wir sammeln und wozu wir diese benutzen.', ], 'SLUG' => 'Schnecke', @@ -120,5 +121,5 @@ // Misc. 'BUILT_WITH_UF' => 'Errichtet mit UserFrosting', 'ADMINLTE_THEME_BY' => 'Theme von Almsaeed Studio. Alle Rechte vorbehalten', - 'WELCOME_TO' => 'Willkommen auf {{title}}!' + 'WELCOME_TO' => 'Willkommen auf {{title}}!', ]; diff --git a/app/sprinkles/core/locale/de_DE/validate.php b/app/sprinkles/core/locale/de_DE/validate.php index 5f49d0491..f6bda6072 100644 --- a/app/sprinkles/core/locale/de_DE/validate.php +++ b/app/sprinkles/core/locale/de_DE/validate.php @@ -1,5 +1,6 @@ [ 'BAD_FILTER' => '{{name}} ist kein gültiger Filter für dieses Sprunje.', 'BAD_LIST' => '{{name}} ist kein gültige Liste für dieses Sprunje.', - 'BAD_SORT' => '{{name}} ist kein gültiges Sortierungsfeld für dieses Sprunje.' - ] - ] + 'BAD_SORT' => '{{name}} ist kein gültiges Sortierungsfeld für dieses Sprunje.', + ], + ], ]; diff --git a/app/sprinkles/core/locale/el/errors.php b/app/sprinkles/core/locale/el/errors.php index 6b7701556..a5c89ff67 100644 --- a/app/sprinkles/core/locale/el/errors.php +++ b/app/sprinkles/core/locale/el/errors.php @@ -1,51 +1,48 @@ [ - "@TRANSLATION" => "Σφάλμα", - - "400" => [ - "TITLE" => "Σφάλμα 400: Bad Request", - "DESCRIPTION" => "Μάλλον δεν είναι δικό σου λάθος.", + 'ERROR' => [ + '@TRANSLATION' => 'Σφάλμα', + + '400' => [ + 'TITLE' => 'Σφάλμα 400: Bad Request', + 'DESCRIPTION' => 'Μάλλον δεν είναι δικό σου λάθος.', ], - - "404" => [ - "TITLE" => "Σφάλμα 404: Δεν βρέθηκε", - "DESCRIPTION" => "Δεν μπορούμε να βρούμε αυτό που ψάχνετε.", - "DETAIL" => "Προσπαθήσαμε να βρούμε τη σελίδα σας ...", - "EXPLAIN" => "Δεν βρήκαμε τη σελίδα που ψάχνατε.", - "RETURN" => 'Όπως κι αν είναι, κάντε κλικ εδώ για να επιστρέψετε στην αρχική σελίδα.', + + '404' => [ + 'TITLE' => 'Σφάλμα 404: Δεν βρέθηκε', + 'DESCRIPTION' => 'Δεν μπορούμε να βρούμε αυτό που ψάχνετε.', + 'DETAIL' => 'Προσπαθήσαμε να βρούμε τη σελίδα σας ...', + 'EXPLAIN' => 'Δεν βρήκαμε τη σελίδα που ψάχνατε.', + 'RETURN' => 'Όπως κι αν είναι, κάντε κλικ εδώ για να επιστρέψετε στην αρχική σελίδα.', ], - - "CONFIG" => [ - "TITLE" => "Πρόβλημα ρύθμισης παραμέτρων του UserFrosting!", - "DESCRIPTION" => "Ορισμένες απαιτήσεις διαμόρφωσης του UserFrosting δεν πληρούνται.", - "DETAIL" => "Κάτι δεν είναι εδώ.", - "RETURN" => 'Παρακαλούμε διορθώστε τα ακόλουθα σφάλματα και στη συνέχεια, επαναλάβετε τη φόρτωση.' + + 'CONFIG' => [ + 'TITLE' => 'Πρόβλημα ρύθμισης παραμέτρων του UserFrosting!', + 'DESCRIPTION' => 'Ορισμένες απαιτήσεις διαμόρφωσης του UserFrosting δεν πληρούνται.', + 'DETAIL' => 'Κάτι δεν είναι εδώ.', + 'RETURN' => 'Παρακαλούμε διορθώστε τα ακόλουθα σφάλματα και στη συνέχεια, επαναλάβετε τη φόρτωση.', ], - - "DESCRIPTION" => "Έχουμε αισθανθεί μια μεγάλη διαταραχή στη Δύναμη.", - "DETAIL" => "Λοιπόν έχουμε αυτά τα στοιχεία:", - - "ENCOUNTERED" => "Εεεε ... κάτι συνέβη, δεν ξέρουμε τι.", - - "MAIL" => "Κρίσιμο σφάλμα κατά την προσπάθεια αποστολής ηλ. μηνύματος, επικοινωνήστε με τον διαχειριστή του διακομιστή σας. Αν είστε ο διαχειριστής, ελέγξτε το αρχείο καταγραφής UserFrosting.", - - "RETURN" => 'Κάντε κλικ εδώ για να επιστρέψετε στην αρχική σελίδα.', - - "SERVER" => "Ωχ, φαίνεται ότι ο διακομιστής μας μπορεί να έχει μπερδευτεί. Αν είστε ο διαχειριστής, ελέγξτε τα αρχεία καταγραφής PHP ή UserFrosting.", - - "TITLE" => "Διαταραχή της Δύναμης" - ] + + 'DESCRIPTION' => 'Έχουμε αισθανθεί μια μεγάλη διαταραχή στη Δύναμη.', + 'DETAIL' => 'Λοιπόν έχουμε αυτά τα στοιχεία:', + + 'ENCOUNTERED' => 'Εεεε ... κάτι συνέβη, δεν ξέρουμε τι.', + + 'MAIL' => 'Κρίσιμο σφάλμα κατά την προσπάθεια αποστολής ηλ. μηνύματος, επικοινωνήστε με τον διαχειριστή του διακομιστή σας. Αν είστε ο διαχειριστής, ελέγξτε το αρχείο καταγραφής UserFrosting.', + + 'RETURN' => 'Κάντε κλικ εδώ για να επιστρέψετε στην αρχική σελίδα.', + + 'SERVER' => 'Ωχ, φαίνεται ότι ο διακομιστής μας μπορεί να έχει μπερδευτεί. Αν είστε ο διαχειριστής, ελέγξτε τα αρχεία καταγραφής PHP ή UserFrosting.', + + 'TITLE' => 'Διαταραχή της Δύναμης', + ], ]; diff --git a/app/sprinkles/core/locale/el/messages.php b/app/sprinkles/core/locale/el/messages.php index 688da9ceb..5ba0b5afa 100644 --- a/app/sprinkles/core/locale/el/messages.php +++ b/app/sprinkles/core/locale/el/messages.php @@ -1,105 +1,102 @@ 1, - "ABOUT" => "Σχετικά", - "CAPTCHA" => [ - "@TRANSLATION" => "Captcha", - "FAIL" => "Δεν έχετε εισάγει σωστά τον κωδικό captcha.", - "SPECIFY" => "Εισαγάγετε τον captcha", - "VERIFY" => "Επαλήθευση του captcha" + '@PLURAL_RULE' => 1, + 'ABOUT' => 'Σχετικά', + 'CAPTCHA' => [ + '@TRANSLATION' => 'Captcha', + 'FAIL' => 'Δεν έχετε εισάγει σωστά τον κωδικό captcha.', + 'SPECIFY' => 'Εισαγάγετε τον captcha', + 'VERIFY' => 'Επαλήθευση του captcha', ], - "CSRF_MISSING" => "Λείπει το CSRF token. Γιατί δεν δοκιμάζετε να ανανεώσετε τη σελίδα και στη συνέχεια να υποβάλετε ξανά;", - "DB_INVALID" => "Δεν είναι δυνατή η σύνδεση με τη βάση δεδομένων Εάν είστε διαχειριστής, ελέγξτε το αρχείο καταγραφής σφαλμάτων.", - "DESCRIPTION" => "Περιγραφή", - "DOWNLOAD" => [ - "@TRANSLATION" => "Λήψη", - "CSV" => "Λήψη CSV" + 'CSRF_MISSING' => 'Λείπει το CSRF token. Γιατί δεν δοκιμάζετε να ανανεώσετε τη σελίδα και στη συνέχεια να υποβάλετε ξανά;', + 'DB_INVALID' => 'Δεν είναι δυνατή η σύνδεση με τη βάση δεδομένων Εάν είστε διαχειριστής, ελέγξτε το αρχείο καταγραφής σφαλμάτων.', + 'DESCRIPTION' => 'Περιγραφή', + 'DOWNLOAD' => [ + '@TRANSLATION' => 'Λήψη', + 'CSV' => 'Λήψη CSV', ], - "EMAIL" => [ - "@TRANSLATION" => "Email", - "YOUR" => "Η διεύθυνσή σας ηλεκτρονικού ταχυδρομείου" + 'EMAIL' => [ + '@TRANSLATION' => 'Email', + 'YOUR' => 'Η διεύθυνσή σας ηλεκτρονικού ταχυδρομείου', ], - "HOME" => "Αρχική σελίδα", - "LEGAL" => [ - "@TRANSLATION" => "Όροι χρήσης", - "DESCRIPTION" => "Οι όροι χρήσης που ισχύουν για τη χρήση αυτού του ιστότοπου και των υπηρεσιών μας." + 'HOME' => 'Αρχική σελίδα', + 'LEGAL' => [ + '@TRANSLATION' => 'Όροι χρήσης', + 'DESCRIPTION' => 'Οι όροι χρήσης που ισχύουν για τη χρήση αυτού του ιστότοπου και των υπηρεσιών μας.', ], - "LOCALE" => [ - "@TRANSLATION" => "Γλώσσα" + 'LOCALE' => [ + '@TRANSLATION' => 'Γλώσσα', ], - "NAME" => "Όνομα", - "NAVIGATION" => "Πλοήγηση", - "NO_RESULTS" => "Λυπούμαστε, δεν έχουμε τίποτα εδώ", - "PAGINATION" => [ - "GOTO" => "Μετάβαση στη σελίδα", - "SHOW" => "Εμφάνιση", "OUTPUT" => "{startRow} έως {endRow} από {filteredRows} ({totalRows})", + 'NAME' => 'Όνομα', + 'NAVIGATION' => 'Πλοήγηση', + 'NO_RESULTS' => 'Λυπούμαστε, δεν έχουμε τίποτα εδώ', + 'PAGINATION' => [ + 'GOTO' => 'Μετάβαση στη σελίδα', + 'SHOW' => 'Εμφάνιση', 'OUTPUT' => '{startRow} έως {endRow} από {filteredRows} ({totalRows})', // Paginator // possible variables: {size}, {page}, {totalPages}, {filteredPages}, {startRow}, {endRow}, {filteredRows} and {totalRows} // also {page:input} & {startRow:input} will add a modifiable input in place of the value - "OUTPUT" => "{startRow} έως {endRow} από {filteredRows} ({totalRows})", - "NEXT" => "Επόμενη σελίδα", - "PREVIOUS" => "Προηγούμενη σελίδα", - "FIRST" => "Πρώτη σελίδα", - "LAST" => "Τελευταία σελίδα" + 'OUTPUT' => '{startRow} έως {endRow} από {filteredRows} ({totalRows})', + 'NEXT' => 'Επόμενη σελίδα', + 'PREVIOUS' => 'Προηγούμενη σελίδα', + 'FIRST' => 'Πρώτη σελίδα', + 'LAST' => 'Τελευταία σελίδα', ], - "PRIVACY" => [ - "@TRANSLATION" => "Πολιτική απορρήτου", - "DESCRIPTION" => "Η πολιτική απορρήτου μας περιγράφει τι είδους πληροφορίες συλλέγουμε από εσάς και πώς θα το χρησιμοποιήσουμε" . -     ], - "SLUG" => "Slug", - "SLUG_CONDITION" => "Slug/ Προϋποθέσεις", - "SLUG_IN_USE" => "Υπάρχει ήδη ένα slug {{slug}} ", - "STATUS" => "Κατάσταση", - "SUGGEST" => "Προτείνετε", - "UNKNOWN" => "Άγνωστο", + 'PRIVACY' => [ + '@TRANSLATION' => 'Πολιτική απορρήτου', + 'DESCRIPTION' => 'Η πολιτική απορρήτου μας περιγράφει τι είδους πληροφορίες συλλέγουμε από εσάς και πώς θα το χρησιμοποιήσουμε' . +     , ], + 'SLUG' => 'Slug', + 'SLUG_CONDITION' => 'Slug/ Προϋποθέσεις', + 'SLUG_IN_USE' => 'Υπάρχει ήδη ένα slug {{slug}} ', + 'STATUS' => 'Κατάσταση', + 'SUGGEST' => 'Προτείνετε', + 'UNKNOWN' => 'Άγνωστο', // Actions words - "ACTIONS" => "Ενέργειες", - "ACTIVATE" => "Ενεργοποίηση", - "ACTIVE" => "Ενεργό", - "ADD" => "Προσθήκη", - "CANCEL" => "Ακύρωση", - "CONFIRM" => "Επιβεβαίωση", - "CREATE" => "Δημιουργία", - "DELETE" => "Διαγραφή", - "DELETE_CONFIRM" => "Είστε βέβαιοι ότι θέλετε να γίνει η διαγραφή;", - "DELETE_CONFIRM_YES" => "Ναι, διαγραφή", - "DELETE_CONFIRM_NAMED" => "Είστε βέβαιοι ότι θέλετε να διαγράψετε το {{name}};", - "DELETE_CONFIRM_YES_NAMED" => "Ναι, διαγραφή του {{name}}", - "DELETE_CANNOT_UNDONE" => "Αυτή η ενέργεια δεν μπορεί να ακυρωθεί.", - "DELETE_NAMED" => "Διαγραφή {{name}}", - "DENY" => "Άρνηση", - "DISABLE" => "Απενεργοποίηση", - "DISABLED" => "Απενεργοποιημένο", - "EDIT" => "Επεξεργασία", - "ENABLE" => "Ενεργοποίηση", - "ENABLED" => "Ενεργοποιημένο", - "OVERRIDE" => "Παράκαμψη", - "RESET" => "Επαναφορά", - "SAVE" => "Αποθήκευση", - "ΑΝΑΖΗΤΗΣΗ" => "Αναζήτηση", - "SORT" => "Ταξινόμηση", - "SUBMIT" => "Υποβολή", - "PRINT" => "Εκτύπωση", - "REMOVE" => "Κατάργηση", - "UNACTIVATED" => "Απενεργοποιημένο", - "UPDATE" => "Ενημέρωση", - "YES" => "Ναι", - "NO" => "Όχι", - "OPTIONAL" => "Προαιρετικό", + 'ACTIONS' => 'Ενέργειες', + 'ACTIVATE' => 'Ενεργοποίηση', + 'ACTIVE' => 'Ενεργό', + 'ADD' => 'Προσθήκη', + 'CANCEL' => 'Ακύρωση', + 'CONFIRM' => 'Επιβεβαίωση', + 'CREATE' => 'Δημιουργία', + 'DELETE' => 'Διαγραφή', + 'DELETE_CONFIRM' => 'Είστε βέβαιοι ότι θέλετε να γίνει η διαγραφή;', + 'DELETE_CONFIRM_YES' => 'Ναι, διαγραφή', + 'DELETE_CONFIRM_NAMED' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε το {{name}};', + 'DELETE_CONFIRM_YES_NAMED' => 'Ναι, διαγραφή του {{name}}', + 'DELETE_CANNOT_UNDONE' => 'Αυτή η ενέργεια δεν μπορεί να ακυρωθεί.', + 'DELETE_NAMED' => 'Διαγραφή {{name}}', + 'DENY' => 'Άρνηση', + 'DISABLE' => 'Απενεργοποίηση', + 'DISABLED' => 'Απενεργοποιημένο', + 'EDIT' => 'Επεξεργασία', + 'ENABLE' => 'Ενεργοποίηση', + 'ENABLED' => 'Ενεργοποιημένο', + 'OVERRIDE' => 'Παράκαμψη', + 'RESET' => 'Επαναφορά', + 'SAVE' => 'Αποθήκευση', + 'ΑΝΑΖΗΤΗΣΗ' => 'Αναζήτηση', + 'SORT' => 'Ταξινόμηση', + 'SUBMIT' => 'Υποβολή', + 'PRINT' => 'Εκτύπωση', + 'REMOVE' => 'Κατάργηση', + 'UNACTIVATED' => 'Απενεργοποιημένο', + 'UPDATE' => 'Ενημέρωση', + 'YES' => 'Ναι', + 'NO' => 'Όχι', + 'OPTIONAL' => 'Προαιρετικό', // Misc. - "BUILT_WITH_UF" => "Κατασκευάστηκε με το UserFrosting ", - "ADMINLTE_THEME_BY" => "Θέμα από > Almsaeed Studio . Όλα τα δικαιώματα διατηρούνται", - "WELCOME_TO" => "Καλώς ορίσατε στο {{title}}!" + 'BUILT_WITH_UF' => 'Κατασκευάστηκε με το UserFrosting ', + 'ADMINLTE_THEME_BY' => "Θέμα από > Almsaeed Studio . Όλα τα δικαιώματα διατηρούνται", + 'WELCOME_TO' => 'Καλώς ορίσατε στο {{title}}!', ]; diff --git a/app/sprinkles/core/locale/el/validate.php b/app/sprinkles/core/locale/el/validate.php index 1cd362dfc..465b6f246 100644 --- a/app/sprinkles/core/locale/el/validate.php +++ b/app/sprinkles/core/locale/el/validate.php @@ -1,32 +1,36 @@ [ - "ARRAY" => "Οι τιμές για {{label}} πρέπει να βρίσκονται σε πίνακα.", - "BOOLEAN" => "Η τιμή του {{label}} πρέπει να είναι είτε '0' είτε '1'.", - "INTEGER" => "Η τιμή του {{label}} πρέπει να είναι ακέραιος.", - "INVALID_EMAIL" => "Μη έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου.", - "LENGTH_RANGE" => "Το {{label}} πρέπει να έχει μήκος από {{min}} έως {{max}} χαρακτήρες.", - "MAX_LENGTH" => "Το {{label}} πρέπει να έχει το πολύ {{max}} χαρακτήρες.", - "MIN_LENGTH" => "Το {{label}} πρέπει να έχει τουλάχιστον {{min}} χαρακτήρες.", - "NO_LEAD_WS" => "Η τιμή του {{label}} δεν μπορεί να ξεκινήσει με κενά, στηλοθέτες ή άλλου τύπου κενό διάστημα.", - "NO_TRAIL_WS" => "Η τιμή του {{label}} δεν μπορεί να τερματίζει σε κενά, τηλοθέτες ή άλλου τύπου κενό διάστημα.", - "RANGE" => "Η τιμή του {{label}} πρέπει να είναι μεταξύ {{min}} και {{max}.", - "REQUIRED" => "Παρακαλούμε προσδιορίστε μια τιμή για το {{label}}.", - "SPRUNJE" => [ - "BAD_FILTER" => "Το {{name}} δεν είναι έγκυρο φίλτρο για αυτό το Sprunje.", - "BAD_LIST" => "Το {{name}} δεν είναι έγκυρη λίστα για αυτό το Sprunje.", - "BAD_SORT" => "Το {{name}} δεν είναι έγκυρο πεδίο ταξινόμησης για αυτό το Sprunje." - ] - ] + 'VALIDATE' => [ + 'ARRAY' => 'Οι τιμές για {{label}} πρέπει να βρίσκονται σε πίνακα.', + 'BOOLEAN' => "Η τιμή του {{label}} πρέπει να είναι είτε '0' είτε '1'.", + 'INTEGER' => 'Η τιμή του {{label}} πρέπει να είναι ακέραιος.', + 'INVALID_EMAIL' => 'Μη έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου.', + 'LENGTH_RANGE' => 'Το {{label}} πρέπει να έχει μήκος από {{min}} έως {{max}} χαρακτήρες.', + 'MAX_LENGTH' => 'Το {{label}} πρέπει να έχει το πολύ {{max}} χαρακτήρες.', + 'MIN_LENGTH' => 'Το {{label}} πρέπει να έχει τουλάχιστον {{min}} χαρακτήρες.', + 'NO_LEAD_WS' => 'Η τιμή του {{label}} δεν μπορεί να ξεκινήσει με κενά, στηλοθέτες ή άλλου τύπου κενό διάστημα.', + 'NO_TRAIL_WS' => 'Η τιμή του {{label}} δεν μπορεί να τερματίζει σε κενά, τηλοθέτες ή άλλου τύπου κενό διάστημα.', + 'RANGE' => 'Η τιμή του {{label}} πρέπει να είναι μεταξύ {{min}} και {{max}.', + 'REQUIRED' => 'Παρακαλούμε προσδιορίστε μια τιμή για το {{label}}.', + 'SPRUNJE' => [ + 'BAD_FILTER' => 'Το {{name}} δεν είναι έγκυρο φίλτρο για αυτό το Sprunje.', + 'BAD_LIST' => 'Το {{name}} δεν είναι έγκυρη λίστα για αυτό το Sprunje.', + 'BAD_SORT' => 'Το {{name}} δεν είναι έγκυρο πεδίο ταξινόμησης για αυτό το Sprunje.', + ], + ], ]; diff --git a/app/sprinkles/core/locale/en_US/errors.php b/app/sprinkles/core/locale/en_US/errors.php index 7cfd17e82..dcb3eaf28 100644 --- a/app/sprinkles/core/locale/en_US/errors.php +++ b/app/sprinkles/core/locale/en_US/errors.php @@ -1,5 +1,6 @@ "We can't seem to find what you're looking for.", 'DETAIL' => 'We tried to find your page...', 'EXPLAIN' => 'We could not find the page you were looking for.', - 'RETURN' => 'Either way, click here to return to the front page.' + 'RETURN' => 'Either way, click here to return to the front page.', ], 'CONFIG' => [ 'TITLE' => 'UserFrosting Configuration Issue!', 'DESCRIPTION' => 'Some UserFrosting configuration requirements have not been met.', 'DETAIL' => "Something's not right here.", - 'RETURN' => 'Please fix the following errors, then reload.' + 'RETURN' => 'Please fix the following errors, then reload.', ], 'DESCRIPTION' => "We've sensed a great disturbance in the Force.", @@ -48,6 +49,6 @@ 'SERVER' => "Oops, looks like our server might have goofed. If you're an admin, please check the PHP or UserFrosting logs.", - 'TITLE' => 'Disturbance in the Force' - ] + 'TITLE' => 'Disturbance in the Force', + ], ]; diff --git a/app/sprinkles/core/locale/en_US/messages.php b/app/sprinkles/core/locale/en_US/messages.php index 6d21d1f8d..b086909b3 100644 --- a/app/sprinkles/core/locale/en_US/messages.php +++ b/app/sprinkles/core/locale/en_US/messages.php @@ -1,5 +1,6 @@ 'Captcha', 'FAIL' => 'You did not enter the captcha code correctly.', 'SPECIFY' => 'Enter the captcha', - 'VERIFY' => 'Verify the captcha' + 'VERIFY' => 'Verify the captcha', ], 'CSRF_MISSING' => 'Missing CSRF token. Try refreshing the page and then submitting again?', @@ -30,23 +31,23 @@ 'DESCRIPTION' => 'Description', 'DOWNLOAD' => [ '@TRANSLATION' => 'Download', - 'CSV' => 'Download CSV' + 'CSV' => 'Download CSV', ], 'EMAIL' => [ '@TRANSLATION' => 'Email', - 'YOUR' => 'Your email address' + 'YOUR' => 'Your email address', ], 'HOME' => 'Home', 'LEGAL' => [ '@TRANSLATION' => 'Legal Policy', - 'DESCRIPTION' => 'Our legal policy applies to your usage of this website and our services.' + 'DESCRIPTION' => 'Our legal policy applies to your usage of this website and our services.', ], 'LOCALE' => [ - '@TRANSLATION' => 'Locale' + '@TRANSLATION' => 'Locale', ], 'NAME' => 'Name', @@ -64,11 +65,11 @@ 'NEXT' => 'Next page', 'PREVIOUS' => 'Previous page', 'FIRST' => 'First page', - 'LAST' => 'Last page' + 'LAST' => 'Last page', ], 'PRIVACY' => [ '@TRANSLATION' => 'Privacy Policy', - 'DESCRIPTION' => 'Our privacy policy outlines what kind of information we collect from you and how we will use it.' + 'DESCRIPTION' => 'Our privacy policy outlines what kind of information we collect from you and how we will use it.', ], 'SLUG' => 'Slug', @@ -117,5 +118,5 @@ // Misc. 'BUILT_WITH_UF' => 'Built with UserFrosting', 'ADMINLTE_THEME_BY' => 'Theme by Almsaeed Studio. All rights reserved', - 'WELCOME_TO' => 'Welcome to {{title}}!' + 'WELCOME_TO' => 'Welcome to {{title}}!', ]; diff --git a/app/sprinkles/core/locale/en_US/validate.php b/app/sprinkles/core/locale/en_US/validate.php index d978b746f..4872de007 100644 --- a/app/sprinkles/core/locale/en_US/validate.php +++ b/app/sprinkles/core/locale/en_US/validate.php @@ -1,5 +1,6 @@ [ 'BAD_FILTER' => '{{name}} is not a valid filter for this Sprunje.', 'BAD_LIST' => '{{name}} is not a valid list for this Sprunje.', - 'BAD_SORT' => '{{name}} is not a valid sort field for this Sprunje.' - ] - ] + 'BAD_SORT' => '{{name}} is not a valid sort field for this Sprunje.', + ], + ], ]; diff --git a/app/sprinkles/core/locale/es_ES/errors.php b/app/sprinkles/core/locale/es_ES/errors.php index 6040f0485..08458102c 100755 --- a/app/sprinkles/core/locale/es_ES/errors.php +++ b/app/sprinkles/core/locale/es_ES/errors.php @@ -1,5 +1,6 @@ 'Parece que no podemos encontrar lo que buscas.', 'DETAIL' => 'Intentamos encontrar tu página ...', 'EXPLAIN' => 'No pudimos encontrar la página que buscabas.', - 'RETURN' => 'De cualquier manera, haz clic en aquí para volver a la página principal.' + 'RETURN' => 'De cualquier manera, haz clic en aquí para volver a la página principal.', ], 'CONFIG' => [ 'TITLE' => '¡Problema de configuración del Servidor!', 'DESCRIPTION' => 'Algunos requisitos de configuración de Servidor no se han cumplido.', 'DETAIL' => 'Algo no está bien aquí.', - 'RETURN' => 'Corrije los siguientes errores, luego recargue .' + 'RETURN' => 'Corrije los siguientes errores, luego recargue .', ], 'DESCRIPTION' => 'Hemos sentido una gran perturbación en la Fuerza.', @@ -48,5 +49,5 @@ 'SERVER' => '¡Vaya! Parece que nuestro servidor pudo haber metido la pata. Si eres un administrador, comprueba los registros de errores de PHP o el log de UserFrosting.', 'TITLE' => 'Perturbación en la Fuerza', - ] + ], ]; diff --git a/app/sprinkles/core/locale/es_ES/messages.php b/app/sprinkles/core/locale/es_ES/messages.php index 34215d208..4d5766134 100755 --- a/app/sprinkles/core/locale/es_ES/messages.php +++ b/app/sprinkles/core/locale/es_ES/messages.php @@ -1,5 +1,6 @@ 'Captcha', 'FAIL' => 'No has introducido correctamente el código de captcha.', 'SPECIFY' => 'Introduzce el captcha', - 'VERIFY' => 'Verificar el captcha' + 'VERIFY' => 'Verificar el captcha', ], 'CSRF_MISSING' => '¿Falta el símbolo CSRF?. Intenta refrescar la página y luego volver a enviarla', @@ -31,12 +32,12 @@ 'DESCRIPTION' => 'Descripción', 'DOWNLOAD' => [ '@TRANSLATION' => 'Descargar', - 'CSV' => 'Descargar CSV' + 'CSV' => 'Descargar CSV', ], 'EMAIL' => [ '@TRANSLATION' => 'Email', - 'YOUR' => 'Tu correo electrónico' + 'YOUR' => 'Tu correo electrónico', ], 'HOME' => 'Inicio', @@ -44,7 +45,7 @@ 'LEGAL' => 'Política Legal', 'LOCALE' => [ - '@TRANSLATION' => 'Traducción' + '@TRANSLATION' => 'Traducción', ], 'MAIL_ERROR' => 'Error fatal al intentar enviar correo, ponte en contacto con el administrador del servidor. Si eres el administrador, comprueba el registro de correo de UF.', @@ -63,7 +64,7 @@ 'NEXT' => 'Siguiente página', 'PREVIOUS' => 'Pagina anterior', 'FIRST' => 'Primera página', - 'LAST' => 'Última página' + 'LAST' => 'Última página', ], 'PRIVACY' => 'Política de privacidad', @@ -112,5 +113,5 @@ // Misc. 'BUILT_WITH_UF' => 'Construido con UserFrosting ', - 'ADMINLTE_THEME_BY' => 'Theme by Almsaeed Studio. All rights reserved' + 'ADMINLTE_THEME_BY' => 'Theme by Almsaeed Studio. All rights reserved', ]; diff --git a/app/sprinkles/core/locale/es_ES/validate.php b/app/sprinkles/core/locale/es_ES/validate.php index 81614c931..5af12cc7c 100755 --- a/app/sprinkles/core/locale/es_ES/validate.php +++ b/app/sprinkles/core/locale/es_ES/validate.php @@ -1,5 +1,6 @@ [ 'BAD_FILTER' => ' {{name}} no es un filtro válido para este Sprunje.', 'BAD_LIST' => ' {{name}} no es una lista válida para este Sprunje.', - 'BAD_SORT' => '{{name}} no es un campo de clasificación válido para este Sprunje.' - ] - ] + 'BAD_SORT' => '{{name}} no es un campo de clasificación válido para este Sprunje.', + ], + ], ]; diff --git a/app/sprinkles/core/locale/fa/errors.php b/app/sprinkles/core/locale/fa/errors.php index ceaf96c51..ad048c2c4 100644 --- a/app/sprinkles/core/locale/fa/errors.php +++ b/app/sprinkles/core/locale/fa/errors.php @@ -1,5 +1,6 @@ 'به نظر نمیرسد چیزی را که دنبالش هستید پیدا کنیم.', 'DETAIL' => 'ما سعی کردیم صفحه شما را پیدا کنیم...', 'EXPLAIN' => 'ما نتوانستیم صفحه ی مورد نظر شما را پیدا کنیم.', - 'RETURN' => 'در هر حال، اینجا کلیک کنید تا به صفحه اصلی بازگردید.' + 'RETURN' => 'در هر حال، اینجا کلیک کنید تا به صفحه اصلی بازگردید.', ], 'CONFIG' => [ 'TITLE' => 'خطای تنظیمات یوزرفروستینگ!', 'DESCRIPTION' => 'برخی از الزامات پیکربندی یوزرفروستینگ به نتیجه نرسید.', 'DETAIL' => 'خطایی پیش آمد.', - 'RETURN' => 'لطفا خطاهای زیر را اصلاح کنید و سپس مجددا بارگذاری نمایید.' + 'RETURN' => 'لطفا خطاهای زیر را اصلاح کنید و سپس مجددا بارگذاری نمایید.', ], 'DESCRIPTION' => 'ما یک اختلال بزرگ در سیستم احساس کردیم.', @@ -47,6 +48,6 @@ 'SERVER' => 'به نظر می آید که در سرور خطایی بوجود آمد. لطفا لاگ پی اچ پی و یوزرفروستینگ را چک کنید.', - 'TITLE' => 'اختلالی پدید آمد.' - ] + 'TITLE' => 'اختلالی پدید آمد.', + ], ]; diff --git a/app/sprinkles/core/locale/fa/messages.php b/app/sprinkles/core/locale/fa/messages.php index 311a82555..76a910f58 100644 --- a/app/sprinkles/core/locale/fa/messages.php +++ b/app/sprinkles/core/locale/fa/messages.php @@ -1,5 +1,6 @@ 'کد امنیتی', 'FAIL' => 'کد امنیتی درست نیست', 'SPECIFY' => 'کد امنیتی را وارد کنید', - 'VERIFY' => 'کد امنیتی را بررسی کنید' + 'VERIFY' => 'کد امنیتی را بررسی کنید', ], 'CSRF_MISSING' => 'سی اس آر اف توکن یافت نشد. لطفا صفحه را از نو بارگذاری کرده و دوباره تلاش کنید.', @@ -30,12 +31,12 @@ 'DESCRIPTION' => 'توضیحات', 'DOWNLOAD' => [ '@TRANSLATION' => 'دانلود', - 'CSV' => 'دانلود سی اس وی' + 'CSV' => 'دانلود سی اس وی', ], 'EMAIL' => [ '@TRANSLATION' => 'ایمیل', - 'YOUR' => 'آدرس ایمیل' + 'YOUR' => 'آدرس ایمیل', ], 'HOME' => 'خانه', @@ -43,7 +44,7 @@ 'LEGAL' => 'سیاست حقوقی', 'LOCALE' => [ - '@TRANSLATION' => 'زبان' + '@TRANSLATION' => 'زبان', ], 'NAME' => 'نام', @@ -57,7 +58,7 @@ // Paginator // possible variables: {size}, {page}, {totalPages}, {filteredPages}, {startRow}, {endRow}, {filteredRows} and {totalRows} // also {page:input} & {startRow:input} will add a modifiable input in place of the value - 'OUTPUT' => '{startRow} تا {endRow} از {filteredRows} ({totalRows})' + 'OUTPUT' => '{startRow} تا {endRow} از {filteredRows} ({totalRows})', ], 'PRIVACY' => 'سیاست حفظ حریم خصوصی', @@ -106,5 +107,5 @@ // Misc. 'BUILT_WITH_UF' => 'ساخته شده با یوزرفراستینگ', - 'ADMINLTE_THEME_BY' => 'قالب از Almsaeed Studio. تمامی حقوق محفوظ است' + 'ADMINLTE_THEME_BY' => 'قالب از Almsaeed Studio. تمامی حقوق محفوظ است', ]; diff --git a/app/sprinkles/core/locale/fa/validate.php b/app/sprinkles/core/locale/fa/validate.php index 950723cc0..c02949d5f 100644 --- a/app/sprinkles/core/locale/fa/validate.php +++ b/app/sprinkles/core/locale/fa/validate.php @@ -1,5 +1,6 @@ [ 'BAD_FILTER' => '{{name}} فیلتر صحیحی نیست.', 'BAD_LIST' => '{{name}} لیست صحیحی نیست.', - 'BAD_SORT' => '{{name}} فیلد مرتب سازی صحیحی نیست.' - ] - ] + 'BAD_SORT' => '{{name}} فیلد مرتب سازی صحیحی نیست.', + ], + ], ]; diff --git a/app/sprinkles/core/locale/fr_FR/errors.php b/app/sprinkles/core/locale/fr_FR/errors.php index 9ce11c531..f8ae19df3 100644 --- a/app/sprinkles/core/locale/fr_FR/errors.php +++ b/app/sprinkles/core/locale/fr_FR/errors.php @@ -1,5 +1,6 @@ 'Nous ne pouvons trouver ce que vous cherchez.', 'DETAIL' => 'Nous avons tout tenté...', 'EXPLAIN' => 'Nous ne pouvons trouver la page que vous cherchez.', - 'RETURN' => 'Cliquez ici pour retourner à la page d\'accueil.' + 'RETURN' => 'Cliquez ici pour retourner à la page d\'accueil.', ], 'CONFIG' => [ 'TITLE' => 'Problème de configuration UserFrosting!', 'DESCRIPTION' => "Les exigences de configuration de UserFrosting n'ont pas été satisfaites.", 'DETAIL' => 'Quelque chose cloche ici...', - 'RETURN' => 'Corrigez les erreurs suivantes, ensuite recharger la page.' + 'RETURN' => 'Corrigez les erreurs suivantes, ensuite recharger la page.', ], 'DESCRIPTION' => 'Nous avons ressenti un grand bouleversement de la Force.', @@ -47,6 +48,6 @@ 'SERVER' => "Oops, il semblerait que le serveur a gaffé. Si vous êtes administrateur, s-v-p vérifier les logs d'erreurs PHP ou ceux de UserFrosting.", - 'TITLE' => 'Bouleversement de la Force' - ] + 'TITLE' => 'Bouleversement de la Force', + ], ]; diff --git a/app/sprinkles/core/locale/fr_FR/messages.php b/app/sprinkles/core/locale/fr_FR/messages.php index 2d2a46a96..63ac067fa 100644 --- a/app/sprinkles/core/locale/fr_FR/messages.php +++ b/app/sprinkles/core/locale/fr_FR/messages.php @@ -1,5 +1,6 @@ 'Captcha', 'VERIFY' => 'Vérification du captcha', 'SPECIFY' => 'Entrer la valeur du captcha', - 'FAIL' => "La valeur du captcha n'a pas été entrée correctement." + 'FAIL' => "La valeur du captcha n'a pas été entrée correctement.", ], 'CSRF_MISSING' => 'Jeton CSRF manquant. Essayez de rafraîchir la page et de soumettre de nouveau?', @@ -30,12 +31,12 @@ 'DESCRIPTION' => 'Description', 'DOWNLOAD' => [ '@TRANSLATION' => 'Télécharger', - 'CSV' => 'Télécharger CSV' + 'CSV' => 'Télécharger CSV', ], 'EMAIL' => [ '@TRANSLATION' => 'Email', - 'YOUR' => 'Votre adresse email' + 'YOUR' => 'Votre adresse email', ], 'HOME' => 'Accueil', @@ -43,7 +44,7 @@ 'LEGAL' => 'Politique légale', 'LOCALE' => [ - '@TRANSLATION' => 'Langue' + '@TRANSLATION' => 'Langue', ], 'NAME' => 'Nom', @@ -53,7 +54,7 @@ 'PAGINATION' => [ 'GOTO' => 'Aller à la page', 'SHOW' => 'Afficher', - 'OUTPUT' => '{startRow} à {endRow} de {filteredRows} ({totalRows})' + 'OUTPUT' => '{startRow} à {endRow} de {filteredRows} ({totalRows})', ], 'PRIVACY' => 'Politique de confidentialité', @@ -102,5 +103,5 @@ // Misc. 'BUILT_WITH_UF' => 'Créé avec UserFrosting', - 'ADMINLTE_THEME_BY' => 'Thème par Almsaeed Studio. Tous droits réservés' + 'ADMINLTE_THEME_BY' => 'Thème par Almsaeed Studio. Tous droits réservés', ]; diff --git a/app/sprinkles/core/locale/fr_FR/validate.php b/app/sprinkles/core/locale/fr_FR/validate.php index 66809432a..cdd8953b3 100644 --- a/app/sprinkles/core/locale/fr_FR/validate.php +++ b/app/sprinkles/core/locale/fr_FR/validate.php @@ -1,5 +1,6 @@ [ 'BAD_FILTER' => '{{name}} ne peut pas être utilisé pour filtrer ce Sprunje.', 'BAD_LIST' => '{{name}} is not a valid list for this Sprunje.', - 'BAD_SORT' => '{{name}} ne peut pas être utilisé pour trier Sprunje.' - ] - ] + 'BAD_SORT' => '{{name}} ne peut pas être utilisé pour trier Sprunje.', + ], + ], ]; diff --git a/app/sprinkles/core/locale/it_IT/errors.php b/app/sprinkles/core/locale/it_IT/errors.php index ccd8b5ae8..26f257d8d 100644 --- a/app/sprinkles/core/locale/it_IT/errors.php +++ b/app/sprinkles/core/locale/it_IT/errors.php @@ -1,5 +1,6 @@ 'Non riusciamo a trovare quel che cerchi...', 'DETAIL' => 'Abbiamo provato a trovare quello che cercavi...', 'EXPLAIN' => 'Non abbiamo trovato la pagina che stavi cercando.', - 'RETURN' => 'Fai clic qui per tornare alla homepage.' + 'RETURN' => 'Fai clic qui per tornare alla homepage.', ], 'CONFIG' => [ 'TITLE' => 'Problema di configurazione di UserFrosting!', 'DESCRIPTION' => 'Alcuni requisiti di configurazione di UserFrosting non sono stati soddisfatti.', 'DETAIL' => 'Qualcosa qui non va bene.', - 'RETURN' => 'Correggi i seguenti errori, quindi ricarica la pagina.' + 'RETURN' => 'Correggi i seguenti errori, quindi ricarica la pagina.', ], 'DESCRIPTION' => 'Abbiamo notato un grande disturbo della Forza.', @@ -49,6 +50,6 @@ 'SERVER' => 'Sembra esserci un errore nel server. Se sei un admin, controlla i log di PHP o UserFrosting.', - 'TITLE' => 'Disturbo della Forza' - ] + 'TITLE' => 'Disturbo della Forza', + ], ]; diff --git a/app/sprinkles/core/locale/it_IT/messages.php b/app/sprinkles/core/locale/it_IT/messages.php index ae848a2cb..8d336b529 100644 --- a/app/sprinkles/core/locale/it_IT/messages.php +++ b/app/sprinkles/core/locale/it_IT/messages.php @@ -1,5 +1,6 @@ 'Captcha', 'FAIL' => 'Captcha errato', 'SPECIFY' => 'Inserisci il captcha', - 'VERIFY' => 'Verifica captcha' + 'VERIFY' => 'Verifica captcha', ], 'CSRF_MISSING' => 'Token CSRF mancante. Prova ad aggiornare la pagina e poi invia nuovamente la richiesta.', @@ -32,23 +33,23 @@ 'DESCRIPTION' => 'Descrizione', 'DOWNLOAD' => [ '@TRANSLATION' => 'Scarica', - 'CSV' => 'Scarica CSV' + 'CSV' => 'Scarica CSV', ], 'EMAIL' => [ '@TRANSLATION' => 'Email', - 'YOUR' => 'La tua email' + 'YOUR' => 'La tua email', ], 'HOME' => 'Home', 'LEGAL' => [ '@TRANSLATION' => 'Politica legale', - 'DESCRIPTION' => 'La nostra politica legale si applica al tuo utilizzo di questo sito e dei nostri servizi.' + 'DESCRIPTION' => 'La nostra politica legale si applica al tuo utilizzo di questo sito e dei nostri servizi.', ], 'LOCALE' => [ - '@TRANSLATION' => 'Lingua' + '@TRANSLATION' => 'Lingua', ], 'NAME' => 'Nome', @@ -66,11 +67,11 @@ 'NEXT' => 'Pagina successiva', 'PREVIOUS' => 'Pagina precedente', 'FIRST' => 'Prima pagina', - 'LAST' => 'Ultima pagina' + 'LAST' => 'Ultima pagina', ], 'PRIVACY' => [ '@TRANSLATION' => 'Politica sulla riservatezza', - 'DESCRIPTION' => 'La nostra politica sulla privacy descrive quali tipi di informazioni raccoglieremo da te e come le useremo.' + 'DESCRIPTION' => 'La nostra politica sulla privacy descrive quali tipi di informazioni raccoglieremo da te e come le useremo.', ], 'SLUG' => 'Slug', @@ -120,5 +121,5 @@ // Misc. 'BUILT_WITH_UF' => 'Construito con UserFrosting', 'ADMINLTE_THEME_BY' => 'Tema di Almsaeed Studio. Tutti i diritti riservati', - 'WELCOME_TO' => 'Benvenuto su {{title}}!' + 'WELCOME_TO' => 'Benvenuto su {{title}}!', ]; diff --git a/app/sprinkles/core/locale/it_IT/validate.php b/app/sprinkles/core/locale/it_IT/validate.php index c252f56bb..d5dc3931c 100644 --- a/app/sprinkles/core/locale/it_IT/validate.php +++ b/app/sprinkles/core/locale/it_IT/validate.php @@ -1,5 +1,6 @@ [ 'BAD_FILTER' => '{{name}} non è un filtro valido per questo Sprunje.', 'BAD_LIST' => ' {{name}} non è un elenco valido per questo Sprunje.', - 'BAD_SORT' => '{{name}} non è un campo di ordinamento valido per questo Sprunje.' - ] - ] + 'BAD_SORT' => '{{name}} non è un campo di ordinamento valido per questo Sprunje.', + ], + ], ]; diff --git a/app/sprinkles/core/locale/pt_PT/errors.php b/app/sprinkles/core/locale/pt_PT/errors.php index b456361ec..d04e64443 100644 --- a/app/sprinkles/core/locale/pt_PT/errors.php +++ b/app/sprinkles/core/locale/pt_PT/errors.php @@ -1,5 +1,6 @@ 'Parece que não conseguimos encontrar a página que procura.', 'DETAIL' => 'Tentámos encontrar a sua página...', 'EXPLAIN' => 'Não conseguimos encontrar a página que procura.', - 'RETURN' => 'De qualquer forma, clique aqui para regressar à página inicial.' + 'RETURN' => 'De qualquer forma, clique aqui para regressar à página inicial.', ], 'CONFIG' => [ 'TITLE' => 'Problema de Configuração do UserFrosting!', 'DESCRIPTION' => 'Alguns requisitos de configuração do UserFrosting não foram satisfeitos.', 'DETAIL' => 'Algo não está bem.', - 'RETURN' => 'Por favor corrija os seguintes erros, depois refresque a página.' + 'RETURN' => 'Por favor corrija os seguintes erros, depois refresque a página.', ], 'DESCRIPTION' => 'Sentimos uma grande perturbância na Força.', @@ -47,6 +48,6 @@ 'SERVER' => 'Oops, parece que o nosso servidor deu o berro. Se é um administrador, por favor consulte o log de erros PHP ou UF.', - 'TITLE' => 'Perturbância na Força' - ] + 'TITLE' => 'Perturbância na Força', + ], ]; diff --git a/app/sprinkles/core/locale/pt_PT/messages.php b/app/sprinkles/core/locale/pt_PT/messages.php index a8648192a..57978df3a 100644 --- a/app/sprinkles/core/locale/pt_PT/messages.php +++ b/app/sprinkles/core/locale/pt_PT/messages.php @@ -1,5 +1,6 @@ 'Captcha', 'FAIL' => 'Código captcha não introduzido corretamente.', 'SPECIFY' => 'Introduza o código captcha', - 'VERIFY' => 'Verifique o código captcha' + 'VERIFY' => 'Verifique o código captcha', ], 'CSRF_MISSING' => 'Token CSRF em falta. Tente refrescar a página e submeter de novo?', @@ -30,12 +31,12 @@ 'DESCRIPTION' => 'Descrição', 'DOWNLOAD' => [ '@TRANSLATION' => 'Descarregar', - 'CSV' => 'Descarregar CSV' + 'CSV' => 'Descarregar CSV', ], 'EMAIL' => [ '@TRANSLATION' => 'Email', - 'YOUR' => 'O seu endereço de email' + 'YOUR' => 'O seu endereço de email', ], 'HOME' => 'Início', @@ -43,7 +44,7 @@ 'LEGAL' => 'Política Legal', 'LOCALE' => [ - '@TRANSLATION' => 'Localização' + '@TRANSLATION' => 'Localização', ], 'NAME' => 'Nome', @@ -52,7 +53,7 @@ 'PAGINATION' => [ 'GOTO' => 'Saltar para Página', 'SHOW' => 'Mostrar', - 'OUTPUT' => '{startRow} to {endRow} of {filteredRows} ({totalRows})' + 'OUTPUT' => '{startRow} to {endRow} of {filteredRows} ({totalRows})', ], 'PRIVACY' => 'Política de Privacidade', @@ -99,5 +100,5 @@ // Misc. 'BUILT_WITH_UF' => 'Desenvolvido sobre UserFrosting', - 'ADMINLTE_THEME_BY' => 'Tema por Almsaeed Studio. Todos os direitos reservados' + 'ADMINLTE_THEME_BY' => 'Tema por Almsaeed Studio. Todos os direitos reservados', ]; diff --git a/app/sprinkles/core/locale/pt_PT/validate.php b/app/sprinkles/core/locale/pt_PT/validate.php index 85b33f72a..1a314ee7c 100644 --- a/app/sprinkles/core/locale/pt_PT/validate.php +++ b/app/sprinkles/core/locale/pt_PT/validate.php @@ -1,5 +1,6 @@ '{{label}} deve conter entre {{min}} e {{max}} caracteres.', 'NO_LEAD_WS' => 'O valor para {{label}} não pode começar por espaços, tabulações, ou outros espaços em branco.', 'NO_TRAIL_WS' => 'O valor para {{label}} não pode terminar em espaços, tabulações, ou outros espaços em branco.', - 'REQUIRED' => 'Por favor especifique um valor para {{label}}.' - ] + 'REQUIRED' => 'Por favor especifique um valor para {{label}}.', + ], ]; diff --git a/app/sprinkles/core/locale/ru_RU/errors.php b/app/sprinkles/core/locale/ru_RU/errors.php index 2b06d5143..9e4e414c4 100644 --- a/app/sprinkles/core/locale/ru_RU/errors.php +++ b/app/sprinkles/core/locale/ru_RU/errors.php @@ -1,5 +1,6 @@ 'Кажется, мы не можем найти то, что вам нужно.', 'DETAIL' => 'Мы пытались найти вашу страницу...', 'EXPLAIN' => 'Мы не можем найти страницу, которую вы искали.', - 'RETURN' => 'В любом случае, нажмите здесь чтобы вернуться на главную страницу.' + 'RETURN' => 'В любом случае, нажмите здесь чтобы вернуться на главную страницу.', ], 'CONFIG' => [ 'TITLE' => 'Проблема в конфигурации!', 'DESCRIPTION' => 'Некоторые требования к конфигурации UserFrosting, не были соблюдены.', 'DETAIL' => 'Что-то здесь не так.', - 'RETURN' => 'Пожалуйста, исправьте следующие ошибки, затем перезагрузите.' + 'RETURN' => 'Пожалуйста, исправьте следующие ошибки, затем перезагрузите.', ], 'DESCRIPTION' => 'Мы обнаружили большое и сильное нарушение.', @@ -47,6 +48,6 @@ 'SERVER' => 'К сожалению, кажется сервер имеет ошибки. Если вы являетесь администратором сервера, пожалуйста проверьте логи.', - 'TITLE' => 'Сильное нарушение' - ] + 'TITLE' => 'Сильное нарушение', + ], ]; diff --git a/app/sprinkles/core/locale/ru_RU/messages.php b/app/sprinkles/core/locale/ru_RU/messages.php index d0c05b5e8..c94df878f 100644 --- a/app/sprinkles/core/locale/ru_RU/messages.php +++ b/app/sprinkles/core/locale/ru_RU/messages.php @@ -1,5 +1,6 @@ 'Капча', 'FAIL' => 'Код безопасности был введен с ошибками.', 'SPECIFY' => 'Введите код капчи', - 'VERIFY' => 'Проверьте капчу' + 'VERIFY' => 'Проверьте капчу', ], 'CSRF_MISSING' => 'Отсутствует CSRF токен. Попробуйте обновить страницу и повторить попытку ещё раз?', @@ -30,23 +31,23 @@ 'DESCRIPTION' => 'Описание', 'DOWNLOAD' => [ '@TRANSLATION' => 'Скачать', - 'CSV' => 'Скачать CSV' + 'CSV' => 'Скачать CSV', ], 'EMAIL' => [ '@TRANSLATION' => 'Email', - 'YOUR' => 'Ваш e-mail' + 'YOUR' => 'Ваш e-mail', ], 'HOME' => 'Главная', 'LEGAL' => [ '@TRANSLATION' => 'Правовая информация', - 'DESCRIPTION' => 'Наша правовая политика применима к использованию вами данного веб-сайта и наших услуг.' + 'DESCRIPTION' => 'Наша правовая политика применима к использованию вами данного веб-сайта и наших услуг.', ], 'LOCALE' => [ - '@TRANSLATION' => 'Язык' + '@TRANSLATION' => 'Язык', ], 'NAME' => 'Имя', @@ -64,11 +65,11 @@ 'NEXT' => 'Следующая', 'PREVIOUS' => 'Предыдущая', 'FIRST' => 'Первая', - 'LAST' => 'Последняя' + 'LAST' => 'Последняя', ], 'PRIVACY' => [ '@TRANSLATION' => 'Политика конфиденциальности', - 'DESCRIPTION' => 'Наша политика конфиденциальности описывает, какую информацию мы собираем от вас и как мы будем использовать её.' + 'DESCRIPTION' => 'Наша политика конфиденциальности описывает, какую информацию мы собираем от вас и как мы будем использовать её.', ], 'SLUG' => 'Метка', @@ -117,5 +118,5 @@ // Misc. 'BUILT_WITH_UF' => 'Создано через UserFrosting', 'ADMINLTE_THEME_BY' => 'Тема от Almsaeed Studio. Все права защищены', - 'WELCOME_TO' => 'Добро пожаловать на {{title}}!' + 'WELCOME_TO' => 'Добро пожаловать на {{title}}!', ]; diff --git a/app/sprinkles/core/locale/ru_RU/validate.php b/app/sprinkles/core/locale/ru_RU/validate.php index 0e317351d..4a32ef837 100644 --- a/app/sprinkles/core/locale/ru_RU/validate.php +++ b/app/sprinkles/core/locale/ru_RU/validate.php @@ -1,5 +1,6 @@ [ 'BAD_FILTER' => '{{name}} не является допустимым фильтром.', 'BAD_LIST' => '{{name}} не является допустимым списком.', - 'BAD_SORT' => '{{name}} не является допустимым для сортировки полей.' - ] - ] + 'BAD_SORT' => '{{name}} не является допустимым для сортировки полей.', + ], + ], ]; diff --git a/app/sprinkles/core/locale/th_TH/errors.php b/app/sprinkles/core/locale/th_TH/errors.php index d526f0de3..d03070630 100644 --- a/app/sprinkles/core/locale/th_TH/errors.php +++ b/app/sprinkles/core/locale/th_TH/errors.php @@ -1,5 +1,6 @@ 'ดูเหมือนเราจะไม่สามารถหาสิ่งที่คุณต้องการได้', 'DETAIL' => 'เราพยายามได้ที่จะหาหน้าของคุณ...', 'EXPLAIN' => 'เราไม่สามารถหาหน้าที่คุณมองหาอยู่ได้', - 'RETURN' => 'อย่างไรก็ตาม คลิก ที่นี่ เพื่อกลับไปยังหน้าแรก' + 'RETURN' => 'อย่างไรก็ตาม คลิก ที่นี่ เพื่อกลับไปยังหน้าแรก', ], 'CONFIG' => [ 'TITLE' => 'เกิดปัญหาจากการตั้งค่า UserFrosting!', 'DESCRIPTION' => 'การตั้งค่าบางอย่างของ UserFrosting ยังไม่ตรงตามความต้องการ', 'DETAIL' => 'มีบางอย่างไม่ถูกต้องอยู่', - 'RETURN' => 'กรุณาแก้ไขข้อผิดพลาดดังกล่าว จากนั้น โหลดหน้านี้อีกครั้ง' + 'RETURN' => 'กรุณาแก้ไขข้อผิดพลาดดังกล่าว จากนั้น โหลดหน้านี้อีกครั้ง', ], 'DESCRIPTION' => 'เรารู้สึกความโกลาหลในกองทัพได้เป็นอย่างดี', @@ -47,6 +48,6 @@ 'SERVER' => 'โอ้ว ดูเหมือนระบบของเราอาจจะผิดพลาดเอง หากคุณเป็นผู้ดูแล กรุณาตรวจสอบบันทึกข้อผิดพลาดของ PHP หรือ UF', - 'TITLE' => 'เกิดความโกลาหลในกองทัพ' - ] + 'TITLE' => 'เกิดความโกลาหลในกองทัพ', + ], ]; diff --git a/app/sprinkles/core/locale/th_TH/messages.php b/app/sprinkles/core/locale/th_TH/messages.php index f203dfd63..2cd6e3dc8 100644 --- a/app/sprinkles/core/locale/th_TH/messages.php +++ b/app/sprinkles/core/locale/th_TH/messages.php @@ -1,5 +1,6 @@ 'รหัสยืนยัน', 'FAIL' => 'คุณยังกรอกรหัสยืนยันไม่ถูกต้อง', 'SPECIFY' => 'กรอกรหัสยืนยัน', - 'VERIFY' => 'ตรวจสอบรหัสยืนยัน' + 'VERIFY' => 'ตรวจสอบรหัสยืนยัน', ], 'CSRF_MISSING' => 'ไม่พบโทเคน CSRF กรุณารีเฟรชแล้วส่งข้อมูลใหม่', @@ -30,12 +31,12 @@ 'DESCRIPTION' => 'รายละเอียด', 'DOWNLOAD' => [ '@TRANSLATION' => 'ดาวน์โหลด', - 'CSV' => 'ดาวน์โหลด CSV' + 'CSV' => 'ดาวน์โหลด CSV', ], 'EMAIL' => [ '@TRANSLATION' => 'อีเมล', - 'YOUR' => 'ที่อยู่อีเมลของคุณ' + 'YOUR' => 'ที่อยู่อีเมลของคุณ', ], 'HOME' => 'หน้าแรก', @@ -43,7 +44,7 @@ 'LEGAL' => 'นโยบายทางกฎหมาย', 'LOCALE' => [ - '@TRANSLATION' => 'ภาษา' + '@TRANSLATION' => 'ภาษา', ], 'NAME' => 'ชื่อ', @@ -52,7 +53,7 @@ 'PAGINATION' => [ 'GOTO' => 'ข้ามไปยังหน้า', 'SHOW' => 'แสดง', - 'OUTPUT' => '{startRow} to {endRow} of {filteredRows} ({totalRows})' + 'OUTPUT' => '{startRow} to {endRow} of {filteredRows} ({totalRows})', ], 'PRIVACY' => 'นโยบายความเป็นส่วนตัว', @@ -99,5 +100,5 @@ // Misc. 'BUILT_WITH_UF' => 'สร้างด้วย UserFrosting', - 'ADMINLTE_THEME_BY' => 'ธีมโดย Almsaeed Studio สงวนลิขสิทธิ์' + 'ADMINLTE_THEME_BY' => 'ธีมโดย Almsaeed Studio สงวนลิขสิทธิ์', ]; diff --git a/app/sprinkles/core/locale/th_TH/validate.php b/app/sprinkles/core/locale/th_TH/validate.php index bf10729c5..41f984c63 100644 --- a/app/sprinkles/core/locale/th_TH/validate.php +++ b/app/sprinkles/core/locale/th_TH/validate.php @@ -1,5 +1,6 @@ 'ความยาวของ {{label}} จะต้องอยู่ระหว่าง {{min}} ถึง {{max}} ตัวอักษร', 'NO_LEAD_WS' => 'ค่าของ {{label}} ไม่สามารถเริ่มต้นด้วยช่องว่าง หรือ แท็บ', 'NO_TRAIL_WS' => 'ค่าของ {{label}} ไม่สามารถลงท้ายด้วยช่องว่าง หรือ แท็บ', - 'REQUIRED' => 'กรุณากำหนดค่าของ {{label}}' - ] + 'REQUIRED' => 'กรุณากำหนดค่าของ {{label}}', + ], ]; diff --git a/app/sprinkles/core/locale/valitron/ar.php b/app/sprinkles/core/locale/valitron/ar.php index ce711a8f0..0f246f2ff 100644 --- a/app/sprinkles/core/locale/valitron/ar.php +++ b/app/sprinkles/core/locale/valitron/ar.php @@ -1,5 +1,6 @@ "يجب ان يكون تاريخ بهذه الصيغة '%s'", 'dateBefore' => "التاريخ يجب ان يكون قبل '%s'", 'dateAfter' => "التاريخ يجب ان يكون بعد '%s'", - 'contains' => 'يجب ان يحتوي %s' + 'contains' => 'يجب ان يحتوي %s', ]; diff --git a/app/sprinkles/core/locale/valitron/de.php b/app/sprinkles/core/locale/valitron/de.php index 2dd0c4a8c..057edb744 100644 --- a/app/sprinkles/core/locale/valitron/de.php +++ b/app/sprinkles/core/locale/valitron/de.php @@ -1,5 +1,6 @@ 'benötigt zwischen %d und %d Zeichen', 'creditCard' => 'muss eine gültige Kreditkartennummer sein', 'lengthMin' => 'muss mindestens %d Zeichen enthalten', - 'lengthMax' => 'kann nicht mehr als %d Zeichen enthalten' + 'lengthMax' => 'kann nicht mehr als %d Zeichen enthalten', ]; diff --git a/app/sprinkles/core/locale/valitron/el.php b/app/sprinkles/core/locale/valitron/el.php index be3b963ec..04ecb157a 100644 --- a/app/sprinkles/core/locale/valitron/el.php +++ b/app/sprinkles/core/locale/valitron/el.php @@ -1,5 +1,6 @@ 'πρέπει να είναι ένα έγκυρο νούμερο πιστωτικής κάρτας', 'lengthMin' => 'πρέπει να περιέχει περισσότερους από %d χαρακτήρες', 'lengthMax' => 'πρέπει να περιέχει λιγότερους από %d χαρακτήρες', - 'instanceOf' => "πρέπει να είναι αντικείμενο της '%s'" + 'instanceOf' => "πρέπει να είναι αντικείμενο της '%s'", ]; diff --git a/app/sprinkles/core/locale/valitron/en.php b/app/sprinkles/core/locale/valitron/en.php index 33fba40bd..e1eca6c91 100644 --- a/app/sprinkles/core/locale/valitron/en.php +++ b/app/sprinkles/core/locale/valitron/en.php @@ -1,5 +1,6 @@ 'must be a valid credit card number', 'lengthMin' => 'must contain greater than %d characters', 'lengthMax' => 'must contain less than %d characters', - 'instanceOf' => "must be an instance of '%s'" + 'instanceOf' => "must be an instance of '%s'", ]; diff --git a/app/sprinkles/core/locale/valitron/es.php b/app/sprinkles/core/locale/valitron/es.php index 320a5e552..b229aa00e 100644 --- a/app/sprinkles/core/locale/valitron/es.php +++ b/app/sprinkles/core/locale/valitron/es.php @@ -1,5 +1,6 @@ 'debe ser un numero de tarjeta de crédito válido', 'lengthMin' => 'debe contener mas de %d caracteres', 'lengthMax' => 'debe contener menos de %d caracteres', - 'instanceOf' => "debe ser una instancia de '%s'" + 'instanceOf' => "debe ser una instancia de '%s'", ]; diff --git a/app/sprinkles/core/locale/valitron/fr.php b/app/sprinkles/core/locale/valitron/fr.php index 06be7497d..6585190d1 100644 --- a/app/sprinkles/core/locale/valitron/fr.php +++ b/app/sprinkles/core/locale/valitron/fr.php @@ -1,5 +1,6 @@ 'doit être un numéro de carte de crédit valide', 'lengthMin' => 'doit contenir plus de %d caractères', 'lengthMax' => 'doit contenir moins de %d caractères', - 'instanceOf' => "doit être une instance de '%s'" + 'instanceOf' => "doit être une instance de '%s'", ]; diff --git a/app/sprinkles/core/locale/valitron/id.php b/app/sprinkles/core/locale/valitron/id.php index c75ea215f..0b8164837 100644 --- a/app/sprinkles/core/locale/valitron/id.php +++ b/app/sprinkles/core/locale/valitron/id.php @@ -1,5 +1,6 @@ 'harus diantara karakter %d dan %d', 'creditCard' => 'nomor kartu kredit harus valid', 'lengthMin' => 'minimal berisi %d karakter', - 'lengthMax' => 'maksimal berisi %d karakter' + 'lengthMax' => 'maksimal berisi %d karakter', ]; diff --git a/app/sprinkles/core/locale/valitron/it.php b/app/sprinkles/core/locale/valitron/it.php index c25ba5458..0173ac08e 100644 --- a/app/sprinkles/core/locale/valitron/it.php +++ b/app/sprinkles/core/locale/valitron/it.php @@ -1,5 +1,6 @@ 'deve contenere %s', 'boolean' => 'deve essere un booleano', 'lengthBetween' => 'deve essere compreso tra %d e %d caratteri', - 'creditCard' => 'deve essere un numero di carta di credito valido' + 'creditCard' => 'deve essere un numero di carta di credito valido', ]; diff --git a/app/sprinkles/core/locale/valitron/ja.php b/app/sprinkles/core/locale/valitron/ja.php index 46ec8abd9..77f136d8e 100644 --- a/app/sprinkles/core/locale/valitron/ja.php +++ b/app/sprinkles/core/locale/valitron/ja.php @@ -1,5 +1,6 @@ 'は%d〜%d文字で入力してください', 'creditCard' => 'はクレジットカード番号の書式として正しくありません', 'lengthMin' => 'は%d文字以上入力してください', - 'lengthMax' => 'は%d文字以内で入力してください' + 'lengthMax' => 'は%d文字以内で入力してください', ]; diff --git a/app/sprinkles/core/locale/valitron/lv.php b/app/sprinkles/core/locale/valitron/lv.php index bd368ddf6..ab1727562 100644 --- a/app/sprinkles/core/locale/valitron/lv.php +++ b/app/sprinkles/core/locale/valitron/lv.php @@ -1,5 +1,6 @@ 'laukam jāsatur %s', 'boolean' => 'laukam jābūt ir/nav vērtībai', 'lengthBetween' => 'lauka garumam jābūt no %d līdz %d simbolu garam', - 'creditCard' => 'laukam jābūt derīgam kredītkartes numuram' + 'creditCard' => 'laukam jābūt derīgam kredītkartes numuram', ]; diff --git a/app/sprinkles/core/locale/valitron/pt-br.php b/app/sprinkles/core/locale/valitron/pt-br.php index 1d8407993..fa02fdc57 100644 --- a/app/sprinkles/core/locale/valitron/pt-br.php +++ b/app/sprinkles/core/locale/valitron/pt-br.php @@ -1,5 +1,6 @@ "deve ser uma data no formato '%s'", 'dateBefore' => "deve ser uma data anterior a '%s'", 'dateAfter' => "deve ser uma data posterior a '%s'", - 'contains' => 'deve conter %s' + 'contains' => 'deve conter %s', ]; diff --git a/app/sprinkles/core/locale/valitron/ro.php b/app/sprinkles/core/locale/valitron/ro.php index 262c42f92..7f08859ee 100644 --- a/app/sprinkles/core/locale/valitron/ro.php +++ b/app/sprinkles/core/locale/valitron/ro.php @@ -1,5 +1,6 @@ 'trebuie sa fie un card de credit valid', 'lengthMin' => 'trebuie sa contina mai mult de %d caractere', 'lengthMax' => 'trebuie sa contina mai putin de %d caractere', - 'instanceOf' => "trebuie sa fie o instanta a '%s'" + 'instanceOf' => "trebuie sa fie o instanta a '%s'", ]; diff --git a/app/sprinkles/core/locale/valitron/ru.php b/app/sprinkles/core/locale/valitron/ru.php index d6ee800c7..cd713e562 100644 --- a/app/sprinkles/core/locale/valitron/ru.php +++ b/app/sprinkles/core/locale/valitron/ru.php @@ -1,5 +1,6 @@ 'должно содержать от %d до %d символов', 'creditCard' => 'должно быть номером кредитной карты', 'lengthMin' => 'должно содержать более %d символов', - 'lengthMax' => 'должно содержать менее %d символов' + 'lengthMax' => 'должно содержать менее %d символов', ]; diff --git a/app/sprinkles/core/locale/valitron/th.php b/app/sprinkles/core/locale/valitron/th.php index b57f6cb83..e4dd31af7 100644 --- a/app/sprinkles/core/locale/valitron/th.php +++ b/app/sprinkles/core/locale/valitron/th.php @@ -1,5 +1,6 @@ 'จะต้องเป็นหมายเลขบัตรเครดิตที่ถูกต้อง', 'lengthMin' => 'จะต้องมีความยาวมากกว่า %d ตัวอักษร', 'lengthMax' => 'จะต้องมีความยาวน้อยกว่า %d ตัวอักษร', - 'instanceOf' => "จะต้องเป็นกรณีของ '%s'" + 'instanceOf' => "จะต้องเป็นกรณีของ '%s'", ]; diff --git a/app/sprinkles/core/locale/valitron/zh-cn.php b/app/sprinkles/core/locale/valitron/zh-cn.php index 8eaa55277..b114dcfe8 100644 --- a/app/sprinkles/core/locale/valitron/zh-cn.php +++ b/app/sprinkles/core/locale/valitron/zh-cn.php @@ -1,5 +1,6 @@ "日期的格式应该为 '%s'", 'dateBefore' => "日期必须在 '%s' 之前", 'dateAfter' => "日期必须在 '%s' 之后", - 'contains' => '必须包含 %s' + 'contains' => '必须包含 %s', ]; diff --git a/app/sprinkles/core/locale/valitron/zh-tw.php b/app/sprinkles/core/locale/valitron/zh-tw.php index b5e4fc043..98cc15693 100644 --- a/app/sprinkles/core/locale/valitron/zh-tw.php +++ b/app/sprinkles/core/locale/valitron/zh-tw.php @@ -1,5 +1,6 @@ "日期的格式應該為 '%s'", 'dateBefore' => "日期必須在 '%s' 之前", 'dateAfter' => "日期必須在 '%s' 之後", - 'contains' => '必須包含 %s' + 'contains' => '必須包含 %s', ]; diff --git a/app/sprinkles/core/locale/zh_CN/errors.php b/app/sprinkles/core/locale/zh_CN/errors.php index d0d6374b8..db22c4d8e 100644 --- a/app/sprinkles/core/locale/zh_CN/errors.php +++ b/app/sprinkles/core/locale/zh_CN/errors.php @@ -1,5 +1,6 @@ '我们无法找到你想要的东西.', 'DETAIL' => '我们正努力寻找网页...', 'EXPLAIN' => '我们无法找到你想要的网页.', - 'RETURN' => '不管怎样, 点击 这里 返回前一页.' + 'RETURN' => '不管怎样, 点击 这里 返回前一页.', ], 'CONFIG' => [ 'TITLE' => 'UserFrosting 配置问题!', 'DESCRIPTION' => '一些 UserFrosting 配置要求没有达到.', 'DETAIL' => '这里有些东西不正确.', - 'RETURN' => '请更正如下问题, 然后 重新加载.' + 'RETURN' => '请更正如下问题, 然后 重新加载.', ], 'DESCRIPTION' => '我们发现一股强力干扰.', @@ -45,6 +46,6 @@ 'SERVER' => '哦, 看起来我们的服务器出错了. 如果你是管理员, 请检查PHP及UF的logs.', - 'TITLE' => '强力干扰' - ] + 'TITLE' => '强力干扰', + ], ]; diff --git a/app/sprinkles/core/locale/zh_CN/messages.php b/app/sprinkles/core/locale/zh_CN/messages.php index 4ceb89f55..832933739 100644 --- a/app/sprinkles/core/locale/zh_CN/messages.php +++ b/app/sprinkles/core/locale/zh_CN/messages.php @@ -1,5 +1,6 @@ '验证码', 'FAIL' => 'Y验证码输入错误.', 'SPECIFY' => '输入验证码', - 'VERIFY' => '验证' + 'VERIFY' => '验证', ], 'CSRF_MISSING' => ' CSRF 标记丢失. 请尝试重新加载页面?', @@ -30,12 +31,12 @@ 'DESCRIPTION' => '描述', 'DOWNLOAD' => [ '@TRANSLATION' => '下载', - 'CSV' => '下载 CSV 文件' + 'CSV' => '下载 CSV 文件', ], 'EMAIL' => [ '@TRANSLATION' => '邮件', - 'YOUR' => '你的邮件地址' + 'YOUR' => '你的邮件地址', ], 'HOME' => '首页', @@ -43,7 +44,7 @@ 'LEGAL' => '法律政策', 'LOCALE' => [ - '@TRANSLATION' => '本地' + '@TRANSLATION' => '本地', ], 'MAIL_ERROR' => '尝试发送邮件发送致命错误, 联系网站管理员. 如果你是管理员，请检查UF邮件错误日志.', @@ -53,7 +54,7 @@ 'PAGINATION' => [ 'GOTO' => '跳到页', - 'SHOW' => '显示' + 'SHOW' => '显示', ], 'PRIVACY' => '隐私政策', @@ -102,5 +103,5 @@ // Misc. 'BUILT_WITH_UF' => '使用 UserFrosting', - 'ADMINLTE_THEME_BY' => '主题作者 Almsaeed Studio.保留所有权' + 'ADMINLTE_THEME_BY' => '主题作者 Almsaeed Studio.保留所有权', ]; diff --git a/app/sprinkles/core/locale/zh_CN/validate.php b/app/sprinkles/core/locale/zh_CN/validate.php index 070f5f682..6957b834a 100644 --- a/app/sprinkles/core/locale/zh_CN/validate.php +++ b/app/sprinkles/core/locale/zh_CN/validate.php @@ -1,5 +1,6 @@ '请为 {{label}} 确定一个值.', 'SPRUNJE' => [ 'BAD_FILTER' => '{{name}} 不是一个有效的 Sprunje 过滤器.', - 'BAD_SORT' => '{{name}} 不是一个有效的 Sprunje 排序.' - ] - ] + 'BAD_SORT' => '{{name}} 不是一个有效的 Sprunje 排序.', + ], + ], ]; diff --git a/app/sprinkles/core/routes/routes.php b/app/sprinkles/core/routes/routes.php index 9953af940..ce331d976 100755 --- a/app/sprinkles/core/routes/routes.php +++ b/app/sprinkles/core/routes/routes.php @@ -1,5 +1,6 @@ messageTranslator = $translator; @@ -60,16 +63,17 @@ public function setTranslator(MessageTranslator $translator) /** * Adds a raw text message to the cache message stream. * - * @param string $type The type of message, indicating how it will be styled when outputted. Should be set to "success", "danger", "warning", or "info". - * @param string $message The message to be added to the message stream. - * @return self this MessageStream object. + * @param string $type The type of message, indicating how it will be styled when outputted. Should be set to "success", "danger", "warning", or "info". + * @param string $message The message to be added to the message stream. + * + * @return self this MessageStream object. */ public function addMessage($type, $message) { $messages = $this->messages(); $messages[] = [ 'type' => $type, - 'message' => $message + 'message' => $message, ]; $this->saveMessages($messages); @@ -79,13 +83,15 @@ public function addMessage($type, $message) /** * Adds a text message to the cache message stream, translated into the currently selected language. * - * @param string $type The type of message, indicating how it will be styled when outputted. Should be set to "success", "danger", "warning", or "info". - * @param string $messageId The message id for the message to be added to the message stream. - * @param array[string] $placeholders An optional hash of placeholder names => placeholder values to substitute into the translated message. + * @param string $type The type of message, indicating how it will be styled when outputted. Should be set to "success", "danger", "warning", or "info". + * @param string $messageId The message id for the message to be added to the message stream. + * @param array $placeholders An optional hash of placeholder names => placeholder values to substitute into the translated message. + * * @throws \RuntimeException - * @return self this MessageStream object. + * + * @return self this MessageStream object. */ - public function addMessageTranslated($type, $messageId, $placeholders = []) + public function addMessageTranslated($type, $messageId, array $placeholders = []) { if (!$this->messageTranslator) { throw new \RuntimeException('No translator has been set! Please call MessageStream::setTranslator first.'); @@ -148,9 +154,9 @@ abstract public function messages(); abstract public function resetMessageStream(); /** - * Save messages to the stream + * Save messages to the stream. * - * @param string $message + * @param array $messages */ - abstract protected function saveMessages($message); + abstract protected function saveMessages(array $messages); } diff --git a/app/sprinkles/core/src/Alert/CacheAlertStream.php b/app/sprinkles/core/src/Alert/CacheAlertStream.php index 0dc048029..f4c2385b4 100644 --- a/app/sprinkles/core/src/Alert/CacheAlertStream.php +++ b/app/sprinkles/core/src/Alert/CacheAlertStream.php @@ -1,5 +1,6 @@ cache = $cache; - $this->config = $config; + $this->session_id = $sessionId; parent::__construct($messagesKey, $translator); } @@ -56,8 +56,8 @@ public function __construct($messagesKey, MessageTranslator $translator = null, */ public function messages() { - if ($this->cache->tags('_s'.session_id())->has($this->messagesKey)) { - return $this->cache->tags('_s'.session_id())->get($this->messagesKey) ?: []; + if ($this->getCache()->has($this->messagesKey)) { + return $this->getCache()->get($this->messagesKey) ?: []; } else { return []; } @@ -68,16 +68,24 @@ public function messages() */ public function resetMessageStream() { - $this->cache->tags('_s'.session_id())->forget($this->messagesKey); + $this->getCache()->forget($this->messagesKey); } /** - * Save messages to the stream + * Save messages to the stream. * - * @param string $messages The message + * @param array $messages The message + */ + protected function saveMessages(array $messages) + { + $this->getCache()->forever($this->messagesKey, $messages); + } + + /** + * @return \Illuminate\Cache\TaggedCache */ - protected function saveMessages($messages) + protected function getCache() { - $this->cache->tags('_s'.session_id())->forever($this->messagesKey, $messages); + return $this->cache->tags('_s' . $this->session_id); } } diff --git a/app/sprinkles/core/src/Alert/SessionAlertStream.php b/app/sprinkles/core/src/Alert/SessionAlertStream.php index 5a63d0a6c..a646bba7e 100644 --- a/app/sprinkles/core/src/Alert/SessionAlertStream.php +++ b/app/sprinkles/core/src/Alert/SessionAlertStream.php @@ -1,5 +1,6 @@ session[$this->messagesKey] ?: []; + return $this->session->get($this->messagesKey) ?: []; } /** @@ -54,16 +55,16 @@ public function messages() */ public function resetMessageStream() { - $this->session[$this->messagesKey] = []; + $this->session->set($this->messagesKey, []); } /** - * Save messages to the stream + * Save messages to the stream. * - * @param string $messages The message + * @param array $messages The message */ - protected function saveMessages($messages) + protected function saveMessages(array $messages) { - $this->session[$this->messagesKey] = $messages; + $this->session->set($this->messagesKey, $messages); } } diff --git a/app/sprinkles/core/src/Bakery/BakeCommand.php b/app/sprinkles/core/src/Bakery/BakeCommand.php index 170405364..e1c42c416 100644 --- a/app/sprinkles/core/src/Bakery/BakeCommand.php +++ b/app/sprinkles/core/src/Bakery/BakeCommand.php @@ -1,5 +1,6 @@ io->writeln("{$this->title}"); + $this->executeSetup($input, $output); + $this->executeDebug($input, $output); + $this->executeConfiguration($input, $output); + $this->executeAsset($input, $output); + $this->executeCleanup($input, $output); + } + + /** + * Core setup group of task. + * + * @param InputInterface $input + * @param OutputInterface $output + */ + protected function executeSetup(InputInterface $input, OutputInterface $output) + { $command = $this->getApplication()->find('setup:db'); $command->run($input, $output); $command = $this->getApplication()->find('setup:smtp'); $command->run($input, $output); + } + /** + * Debug group of task. + * + * @param InputInterface $input + * @param OutputInterface $output + */ + protected function executeDebug(InputInterface $input, OutputInterface $output) + { $command = $this->getApplication()->find('debug'); $command->run($input, $output); + } + /** + * Configuration group of task. + * + * @param InputInterface $input + * @param OutputInterface $output + */ + protected function executeConfiguration(InputInterface $input, OutputInterface $output) + { $command = $this->getApplication()->find('migrate'); $command->run($input, $output); + } - $command = $this->getApplication()->find('create-admin'); - $command->run($input, $output); - + /** + * Assets setup group of task. + * + * @param InputInterface $input + * @param OutputInterface $output + */ + protected function executeAsset(InputInterface $input, OutputInterface $output) + { $command = $this->getApplication()->find('build-assets'); $command->run($input, $output); + } + /** + * Cleanup group of task. + * + * @param InputInterface $input + * @param OutputInterface $output + */ + protected function executeCleanup(InputInterface $input, OutputInterface $output) + { $command = $this->getApplication()->find('clear-cache'); $command->run($input, $output); } diff --git a/app/sprinkles/core/src/Bakery/BuildAssets.php b/app/sprinkles/core/src/Bakery/BuildAssets.php index 032ed0a8a..358de51cb 100644 --- a/app/sprinkles/core/src/Bakery/BuildAssets.php +++ b/app/sprinkles/core/src/Bakery/BuildAssets.php @@ -1,5 +1,6 @@ io->writeln('PHP Version : ' . phpversion()); if (version_compare(phpversion(), \UserFrosting\PHP_MIN_VERSION, '<')) { - $this->io->error('UserFrosting requires php version '.\UserFrosting\PHP_MIN_VERSION." or above. You'll need to update you PHP version before you can continue."); + $this->io->error('UserFrosting requires php version ' . \UserFrosting\PHP_MIN_VERSION . " or above. You'll need to update you PHP version before you can continue."); exit(1); } // Check for deprecated versions if (version_compare(phpversion(), \UserFrosting\PHP_RECOMMENDED_VERSION, '<')) { - $this->io->warning('While your PHP version is still supported by UserFrosting, we recommends version '.\UserFrosting\PHP_RECOMMENDED_VERSION.' or above as '.phpversion().' will soon be unsupported. See http://php.net/supported-versions.php for more info.'); + $this->io->warning('While your PHP version is still supported by UserFrosting, we recommends version ' . \UserFrosting\PHP_RECOMMENDED_VERSION . ' or above as ' . phpversion() . ' will soon be unsupported. See http://php.net/supported-versions.php for more info.'); } } /** * List all sprinkles defined in the Sprinkles schema file, - * making sure this file exist at the same time + * making sure this file exist at the same time. * * @param InputInterface $input * @param OutputInterface $output @@ -130,7 +131,7 @@ protected function checkDatabase() } /** - * Display database config as for debug purposes + * Display database config as for debug purposes. */ protected function showConfig() { @@ -145,7 +146,7 @@ protected function showConfig() 'PORT : ' . $config['db.default.port'], 'DATABASE : ' . $config['db.default.database'], 'USERNAME : ' . $config['db.default.username'], - 'PASSWORD : ' . ($config['db.default.password'] ? '*********' : '') + 'PASSWORD : ' . ($config['db.default.password'] ? '*********' : ''), ]); } } diff --git a/app/sprinkles/core/src/Bakery/Helper/ConfirmableTrait.php b/app/sprinkles/core/src/Bakery/Helper/ConfirmableTrait.php index 8cc73fccb..acf3558b0 100644 --- a/app/sprinkles/core/src/Bakery/Helper/ConfirmableTrait.php +++ b/app/sprinkles/core/src/Bakery/Helper/ConfirmableTrait.php @@ -1,5 +1,6 @@ getPdo(); } catch (\PDOException $e) { - $message = "Could not connect to the database '{$dbParams['username']}@{$dbParams['host']}/{$dbParams['database']}':".PHP_EOL; - $message .= 'Exception: ' . $e->getMessage() . PHP_EOL.PHP_EOL; + $message = "Could not connect to the database '{$dbParams['username']}@{$dbParams['host']}/{$dbParams['database']}':" . PHP_EOL; + $message .= 'Exception: ' . $e->getMessage() . PHP_EOL . PHP_EOL; $message .= 'Please check your database configuration and/or google the exception shown above and run command again.'; throw new \Exception($message); } diff --git a/app/sprinkles/core/src/Bakery/Helper/NodeVersionCheck.php b/app/sprinkles/core/src/Bakery/Helper/NodeVersionCheck.php index 29989340f..14cba8e7b 100644 --- a/app/sprinkles/core/src/Bakery/Helper/NodeVersionCheck.php +++ b/app/sprinkles/core/src/Bakery/Helper/NodeVersionCheck.php @@ -1,5 +1,6 @@ io->writeln('Seeding database using class `'.get_class($seedClass).'`'); + $this->io->writeln('Seeding database using class `' . get_class($seedClass) . '`'); // Add seed class to list $seeds[] = $seedClass; diff --git a/app/sprinkles/core/src/Bakery/SeedListCommand.php b/app/sprinkles/core/src/Bakery/SeedListCommand.php index 83595685b..bc15f252b 100644 --- a/app/sprinkles/core/src/Bakery/SeedListCommand.php +++ b/app/sprinkles/core/src/Bakery/SeedListCommand.php @@ -1,5 +1,6 @@ ci->config; @@ -79,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output) 'DB_HOST' => ($dotenvEditor->keyExists('DB_HOST')) ? $dotenvEditor->getValue('DB_HOST') : '', 'DB_NAME' => ($dotenvEditor->keyExists('DB_NAME')) ? $dotenvEditor->getValue('DB_NAME') : '', 'DB_USER' => ($dotenvEditor->keyExists('DB_USER')) ? $dotenvEditor->getValue('DB_USER') : '', - 'DB_PASSWORD' => ($dotenvEditor->keyExists('DB_PASSWORD')) ? $dotenvEditor->getValue('DB_PASSWORD') : '' + 'DB_PASSWORD' => ($dotenvEditor->keyExists('DB_PASSWORD')) ? $dotenvEditor->getValue('DB_PASSWORD') : '', ]; // There may be some custom config or global env values defined on the server. @@ -117,7 +118,7 @@ protected function execute(InputInterface $input, OutputInterface $output) 'DB_PORT' => $dbParams['port'], 'DB_NAME' => $dbParams['database'], 'DB_USER' => $dbParams['username'], - 'DB_PASSWORD' => $dbParams['password'] + 'DB_PASSWORD' => $dbParams['password'], ]; foreach ($fileContent as $key => $value) { @@ -135,10 +136,11 @@ protected function execute(InputInterface $input, OutputInterface $output) } /** - * Ask for database crendentials + * Ask for database crendentials. + * + * @param InputInterface $args Command arguments * - * @param InputInterface $args Command arguments - * @return array The databse credentials + * @return array The databse credentials */ protected function askForDatabase(InputInterface $args) { @@ -164,14 +166,15 @@ protected function askForDatabase(InputInterface $args) // Ask further questions based on driver if ($driver['driver'] == 'sqlite') { $name = ($args->getOption('db_name')) ?: $this->io->ask('Database name', $driver['defaultDBName']); + $host = ($args->getOption('db_host')) ?: $this->io->ask('Hostname', '127.0.0.1'); return [ 'driver' => $driver['driver'], - 'host' => '', + 'host' => $host, 'port' => '', 'database' => $name, 'username' => '', - 'password' => '' + 'password' => '', ]; } else { $defaultPort = $driver['defaultPort']; @@ -192,17 +195,18 @@ protected function askForDatabase(InputInterface $args) 'database' => $name, 'username' => $user, 'password' => $password, - 'charset' => $this->ci->config['db.default.charset'] // Used when replacing config later + 'charset' => $this->ci->config['db.default.charset'], // Used when replacing config later ]; } } /** - * Test new database connecion + * Test new database connecion. + * + * @param array $dbParams Database params + * @param bool $displayMessage Display io message * - * @param array $dbParams Database params - * @param bool $displayMessage Display io message - * @return bool Return true if db is successful + * @return bool Return true if db is successful */ protected function testDatabase($dbParams, $displayMessage = true) { @@ -216,8 +220,8 @@ protected function testDatabase($dbParams, $displayMessage = true) $conn->getPdo(); } catch (\PDOException $e) { if ($displayMessage) { - $message = "Could not connect to the database '{$dbParams['username']}@{$dbParams['host']}/{$dbParams['database']}':".PHP_EOL; - $message .= 'Exception: ' . $e->getMessage() . PHP_EOL.PHP_EOL; + $message = "Could not connect to the database '{$dbParams['username']}@{$dbParams['host']}/{$dbParams['database']}':" . PHP_EOL; + $message .= 'Exception: ' . $e->getMessage() . PHP_EOL . PHP_EOL; $message .= 'Please check your database configuration and/or google the exception shown above and run the command again.'; $this->io->error($message); } @@ -240,31 +244,31 @@ protected function databaseDrivers() 'driver' => 'mysql', 'name' => 'MySQL / MariaDB', 'defaultDBName' => 'userfrosting', - 'defaultPort' => 3306 + 'defaultPort' => 3306, ], [ 'driver' => 'pgsql', 'name' => 'ProgreSQL', 'defaultDBName' => 'userfrosting', - 'defaultPort' => 5432 + 'defaultPort' => 5432, ], [ 'driver' => 'sqlsrv', 'name' => 'SQL Server', 'defaultDBName' => 'userfrosting', - 'defaultPort' => 1433 + 'defaultPort' => 1433, ], [ 'driver' => 'sqlite', 'name' => 'SQLite', 'defaultDBName' => \UserFrosting\DB_DIR . \UserFrosting\DS . 'userfrosting.db', - 'defaultPort' => null - ] + 'defaultPort' => null, + ], ]); } /** - * Returns a list of available drivers + * Returns a list of available drivers. * * @return array */ diff --git a/app/sprinkles/core/src/Bakery/SetupEnvCommand.php b/app/sprinkles/core/src/Bakery/SetupEnvCommand.php index 42bfc5e07..e7beb28d7 100644 --- a/app/sprinkles/core/src/Bakery/SetupEnvCommand.php +++ b/app/sprinkles/core/src/Bakery/SetupEnvCommand.php @@ -1,5 +1,6 @@ ci->config; @@ -87,7 +88,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $keys = [ 'SMTP_HOST' => ($dotenvEditor->keyExists('SMTP_HOST')) ? $dotenvEditor->getValue('SMTP_HOST') : '', 'SMTP_USER' => ($dotenvEditor->keyExists('SMTP_USER')) ? $dotenvEditor->getValue('SMTP_USER') : '', - 'SMTP_PASSWORD' => ($dotenvEditor->keyExists('SMTP_PASSWORD')) ? $dotenvEditor->getValue('SMTP_PASSWORD') : '' + 'SMTP_PASSWORD' => ($dotenvEditor->keyExists('SMTP_PASSWORD')) ? $dotenvEditor->getValue('SMTP_PASSWORD') : '', ]; // There may be some custom config or global env values defined on the server. @@ -120,10 +121,11 @@ protected function execute(InputInterface $input, OutputInterface $output) } /** - * Ask with setup method to use + * Ask with setup method to use. * - * @param InputInterface $input - * @return array The SMTP connection info + * @param InputInterface $input + * + * @return array The SMTP connection info */ protected function askForSmtpMethod(InputInterface $input) { @@ -152,10 +154,11 @@ protected function askForSmtpMethod(InputInterface $input) } /** - * Ask for SMTP credential + * Ask for SMTP credential. + * + * @param InputInterface $input Command arguments * - * @param InputInterface $input Command arguments - * @return array The SMTP connection info + * @return array The SMTP connection info */ protected function askForSmtp(InputInterface $input) { @@ -170,15 +173,16 @@ protected function askForSmtp(InputInterface $input) return [ 'SMTP_HOST' => $smtpHost, 'SMTP_USER' => $smtpUser, - 'SMTP_PASSWORD' => $smtpPassword + 'SMTP_PASSWORD' => $smtpPassword, ]; } /** - * Ask for Gmail + * Ask for Gmail. * - * @param InputInterface $input Command arguments - * @return array The SMTP connection info + * @param InputInterface $input Command arguments + * + * @return array The SMTP connection info */ protected function askForGmail(InputInterface $input) { @@ -191,15 +195,16 @@ protected function askForGmail(InputInterface $input) return [ 'SMTP_HOST' => 'smtp.gmail.com', 'SMTP_USER' => $smtpUser, - 'SMTP_PASSWORD' => $smtpPassword + 'SMTP_PASSWORD' => $smtpPassword, ]; } /** - * Process the "no email support" setup option + * Process the "no email support" setup option. + * + * @param InputInterface $input * - * @param InputInterface $input - * @return array The SMTP connection info + * @return array The SMTP connection info */ protected function askForNone(InputInterface $input) { @@ -210,7 +215,7 @@ protected function askForNone(InputInterface $input) return [ 'SMTP_HOST' => '', 'SMTP_USER' => '', - 'SMTP_PASSWORD' => '' + 'SMTP_PASSWORD' => '', ]; } else { $this->askForSmtpMethod($input); @@ -220,8 +225,9 @@ protected function askForNone(InputInterface $input) /** * Check if the app/.env SMTP portion is defined or not. * - * @param DotenvEditor $dotenvEditor - * @return bool true if SMTP is configured in .env file + * @param DotenvEditor $dotenvEditor + * + * @return bool true if SMTP is configured in .env file */ protected function isSmtpConfigured(DotenvEditor $dotenvEditor) { diff --git a/app/sprinkles/core/src/Bakery/SprinkleListCommand.php b/app/sprinkles/core/src/Bakery/SprinkleListCommand.php index 1f902cbaa..284b2e777 100644 --- a/app/sprinkles/core/src/Bakery/SprinkleListCommand.php +++ b/app/sprinkles/core/src/Bakery/SprinkleListCommand.php @@ -1,5 +1,6 @@ from($config['address_book.admin']) ->addEmailRecipient(new EmailRecipient($to, $to)) ->addParams([ - 'request_date' => Carbon::now()->format('Y-m-d H:i:s') + 'request_date' => Carbon::now()->format('Y-m-d H:i:s'), ]); try { diff --git a/app/sprinkles/core/src/Controller/CoreController.php b/app/sprinkles/core/src/Controller/CoreController.php index c0c7f2a5f..fff89b494 100644 --- a/app/sprinkles/core/src/Controller/CoreController.php +++ b/app/sprinkles/core/src/Controller/CoreController.php @@ -1,5 +1,6 @@ ['onSprinklesInitialized', 0], 'onSprinklesRegisterServices' => ['onSprinklesRegisterServices', 0], 'onAddGlobalMiddleware' => ['onAddGlobalMiddleware', 0], - 'onAppInitialize' => ['onAppInitialize', 0] + 'onAppInitialize' => ['onAppInitialize', 0], ]; } @@ -95,7 +96,7 @@ public function onSprinklesRegisterServices() '1', 'on', 'true', - 'yes' + 'yes', ])) { $displayErrors = true; } @@ -105,7 +106,7 @@ public function onSprinklesRegisterServices() } /** - * Register routes + * Register routes. * * @param Event $event */ @@ -125,7 +126,7 @@ public function onAddGlobalMiddleware(Event $event) } /** - * Register Core sprinkle locator streams + * Register Core sprinkle locator streams. */ protected function registerStreams() { @@ -149,6 +150,5 @@ protected function registerStreams() // Register core sprinkle class streams $locator->registerStream('seeds', '', \UserFrosting\SEEDS_DIR); $locator->registerStream('migrations', '', \UserFrosting\MIGRATIONS_DIR); - } } diff --git a/app/sprinkles/core/src/Csrf/CsrfProviderInterface.php b/app/sprinkles/core/src/Csrf/CsrfProviderInterface.php index de7adc450..7b9d21fc9 100644 --- a/app/sprinkles/core/src/Csrf/CsrfProviderInterface.php +++ b/app/sprinkles/core/src/Csrf/CsrfProviderInterface.php @@ -1,5 +1,6 @@ addUserMessage('CSRF_MISSING'); - throw $e; - return $next($request, $response); + throw $e; }; return new Guard($ci->config['csrf.name'], $csrfStorage, $onFailure, $ci->config['csrf.storage_limit'], $ci->config['csrf.strength'], $ci->config['csrf.persistent_token']); diff --git a/app/sprinkles/core/src/Database/Builder.php b/app/sprinkles/core/src/Database/Builder.php index 12ec3b1c9..a1cb87dc3 100644 --- a/app/sprinkles/core/src/Database/Builder.php +++ b/app/sprinkles/core/src/Database/Builder.php @@ -1,5 +1,6 @@ query->columns)) { - $this->query->select([$this->query->from.'.*']); + $this->query->select([$this->query->from . '.*']); } $function = Str::lower($function); @@ -108,7 +114,7 @@ public function withAggregate($relations, $function = 'COUNT') $relation = $this->getRelationWithoutConstraints($name); - $expression = new Expression($function.'('.$this->query->getGrammar()->wrap($column).')'); + $expression = new Expression($function . '(' . $this->query->getGrammar()->wrap($column) . ')'); // Here we will get the relationship aggregate query and prepare to add it to the main query // as a sub-select. First, we'll get the "has" query and use that to get the relation @@ -126,7 +132,7 @@ public function withAggregate($relations, $function = 'COUNT') // Finally we will add the proper result column alias to the query and run the subselect // statement against the query builder. Then we will return the builder instance back // to the developer for further constraint chaining that needs to take place on it. - $column = snake_case(isset($alias) ? $alias : $name).'_'.$function; + $column = snake_case(isset($alias) ? $alias : $name) . '_' . $function; $this->selectSub($query->toBase(), $column); } diff --git a/app/sprinkles/core/src/Database/Migration.php b/app/sprinkles/core/src/Database/Migration.php index a9d805add..cdadb67ed 100644 --- a/app/sprinkles/core/src/Database/Migration.php +++ b/app/sprinkles/core/src/Database/Migration.php @@ -1,5 +1,6 @@ getMigrationDetails($migrationFile); + // Note that PSR4 insists that all php files must end in PHP, so ignore all + // files that don't end in PHP. + if (preg_match('/php$/', $migrationFile)) { + $migrations[] = $this->getMigrationDetails($migrationFile); + } } return $migrations; } /** - * Return an array of migration details inclusing the classname and the sprinkle name + * Return an array of migration details inclusing the classname and the sprinkle name. + * + * @param ResourceInstance $file The migration file * - * @param ResourceInstance $file The migration file - * @return string The migration full class path + * @return string The migration full class path */ protected function getMigrationDetails(ResourceInstance $file) { diff --git a/app/sprinkles/core/src/Database/Migrator/MigrationLocatorInterface.php b/app/sprinkles/core/src/Database/Migrator/MigrationLocatorInterface.php index 32f149af6..59c3360a3 100644 --- a/app/sprinkles/core/src/Database/Migrator/MigrationLocatorInterface.php +++ b/app/sprinkles/core/src/Database/Migrator/MigrationLocatorInterface.php @@ -1,5 +1,6 @@ $dependency) { $messages[] = "=> $migration (Missing dependency : $dependency)"; } + throw new \Exception(implode("\n", $messages)); } @@ -108,8 +111,9 @@ public function run(array $options = []) /** * Get the migration classes that have not yet run. * - * @param array $available The available migrations returned by the migration locator - * @param array $ran The list of already ran migrations returned by the migration repository + * @param array $available The available migrations returned by the migration locator + * @param array $ran The list of already ran migrations returned by the migration repository + * * @return array The list of pending migrations, ie the available migrations not ran yet */ protected function pendingMigrations(array $available, array $ran) @@ -151,7 +155,7 @@ protected function runPending(array $migrations, array $options = []) } /** - * Run "up" a migration class + * Run "up" a migration class. * * @param string $migrationClassName The migration class name * @param int $batch The current bacth number @@ -195,7 +199,8 @@ protected function runUp($migrationClassName, $batch, $pretend) /** * Rollback the last migration operation. * - * @param array $options The options for the current operation [steps, pretend] + * @param array $options The options for the current operation [steps, pretend] + * * @return array The list of rolledback migration classes */ public function rollback(array $options = []) @@ -215,11 +220,12 @@ public function rollback(array $options = []) } /** - * Rollback a specific migration + * Rollback a specific migration. + * + * @param string $migrationClassName The Migration to rollback + * @param array $options * - * @param string $migrationClassName The Migration to rollback - * @param array $options - * @return array The list of rolledback migration classes + * @return array The list of rolledback migration classes */ public function rollbackMigration($migrationClassName, array $options = []) { @@ -241,7 +247,8 @@ public function rollbackMigration($migrationClassName, array $options = []) /** * Get the migrations for a rollback operation. * - * @param array $options The options for the current operation + * @param array $options The options for the current operation + * * @return array An ordered array of migrations to rollback */ protected function getMigrationsForRollback(array $options) @@ -257,8 +264,9 @@ protected function getMigrationsForRollback(array $options) /** * Rollback the given migrations. * - * @param array $migrations An array of migrations to rollback formated as an eloquent collection - * @param array $options The options for the current operation + * @param array $migrations An array of migrations to rollback formated as an eloquent collection + * @param array $options The options for the current operation + * * @return array The list of rolledback migration classes */ protected function rollbackMigrations(array $migrations, array $options) @@ -303,7 +311,8 @@ protected function rollbackMigrations(array $migrations, array $options) /** * Check if migrations can be rolledback. * - * @param array $migrations The migrations classes to rollback + * @param array $migrations The migrations classes to rollback + * * @throws \Exception If rollback can't be performed */ protected function checkRollbackDependencies(array $migrations) @@ -320,6 +329,7 @@ protected function checkRollbackDependencies(array $migrations) foreach ($unfulfillable as $migration => $dependency) { $messages[] = "=> $dependency is a dependency of $migration"; } + throw new \Exception(implode("\n", $messages)); } } @@ -327,7 +337,8 @@ protected function checkRollbackDependencies(array $migrations) /** * Rolls all of the currently applied migrations back. * - * @param bool $pretend Should this operation be pretended + * @param bool $pretend Should this operation be pretended + * * @return array An array of all the rolledback migration classes */ public function reset($pretend = false) @@ -377,7 +388,7 @@ protected function runDown($migrationClassName, $pretend) /** * Run a migration inside a transaction if the database supports it. - * Note : As of Laravel 5.4, only PostgresGrammar supports it + * Note : As of Laravel 5.4, only PostgresGrammar supports it. * * @param MigrationInterface $migration The migration instance * @param string $method The method used [up, down] @@ -417,9 +428,10 @@ protected function pretendToRun(MigrationInterface $migration, $method) /** * Get all of the queries that would be run for a migration. * - * @param MigrationInterface $migration The migration instance - * @param string $method The method used [up, down] - * @return array The queries executed by the processed schema + * @param MigrationInterface $migration The migration instance + * @param string $method The method used [up, down] + * + * @return array The queries executed by the processed schema */ protected function getQueries(MigrationInterface $migration, $method) { @@ -434,7 +446,8 @@ protected function getQueries(MigrationInterface $migration, $method) /** * Resolve a migration instance from it's class name. * - * @param string $migrationClassName The class name + * @param string $migrationClassName The class name + * * @return MigrationInterface The migration class instance */ public function resolve($migrationClassName) @@ -446,7 +459,7 @@ public function resolve($migrationClassName) $migration = new $migrationClassName($this->getSchemaBuilder()); if (!$migration instanceof MigrationInterface) { - throw new \Exception('Migration must be an instance of `'.MigrationInterface::class.'`'); + throw new \Exception('Migration must be an instance of `' . MigrationInterface::class . '`'); } return $migration; @@ -463,10 +476,11 @@ public function getAvailableMigrations() } /** - * Get a list of all ran migrations + * Get a list of all ran migrations. + * + * @param int $steps Number of batch to return + * @param string $order asc|desc * - * @param int $steps Number of batch to return - * @param string $order asc|desc * @return array */ public function getRanMigrations($steps = -1, $order = 'asc') @@ -475,7 +489,7 @@ public function getRanMigrations($steps = -1, $order = 'asc') } /** - * Get a list of pending migrations + * Get a list of pending migrations. * * @return array */ @@ -498,7 +512,7 @@ public function getRepository() } /** - * Set the migration repository instance + * Set the migration repository instance. * * @param MigrationRepositoryInterface $repository */ @@ -528,7 +542,7 @@ public function getLocator() } /** - * Set the migration locator instance + * Set the migration locator instance. * * @param MigrationLocatorInterface $locator */ @@ -548,7 +562,7 @@ public function getSchemaBuilder() } /** - * Return the connection instance + * Return the connection instance. * * @return \Illuminate\Database\Connection */ @@ -558,7 +572,7 @@ public function getConnection() } /** - * Define which connection to use + * Define which connection to use. * * @param string $name The connection name */ @@ -569,7 +583,8 @@ public function setConnection($name) } /** - * Get instance of Grammar + * Get instance of Grammar. + * * @return \Illuminate\Database\Schema\Grammars\Grammar */ protected function getSchemaGrammar() diff --git a/app/sprinkles/core/src/Database/Models/Concerns/HasRelationships.php b/app/sprinkles/core/src/Database/Models/Concerns/HasRelationships.php index 948a88c76..af2dce674 100644 --- a/app/sprinkles/core/src/Database/Models/Concerns/HasRelationships.php +++ b/app/sprinkles/core/src/Database/Models/Concerns/HasRelationships.php @@ -1,5 +1,6 @@ newQuery(), $this, - $instance->getTable().'.'.$foreignKey, + $instance->getTable() . '.' . $foreignKey, $localKey ); } @@ -60,11 +62,12 @@ public function hasMany($related, $foreignKey = null, $localKey = null) /** * Overrides the default Eloquent morphMany relationship to return a MorphManySyncable. * - * @param string $related - * @param string $name - * @param string $type - * @param string $id - * @param string $localKey + * @param string $related + * @param string $name + * @param string $type + * @param string $id + * @param string $localKey + * * @return MorphManySyncable */ public function morphMany($related, $name, $type = null, $id = null, $localKey = null) @@ -78,33 +81,34 @@ public function morphMany($related, $name, $type = null, $id = null, $localKey = $table = $instance->getTable(); $localKey = $localKey ?: $this->getKeyName(); - return new MorphManySyncable($instance->newQuery(), $this, $table.'.'.$type, $table.'.'.$id, $localKey); + return new MorphManySyncable($instance->newQuery(), $this, $table . '.' . $type, $table . '.' . $id, $localKey); } /** * Define a many-to-many 'through' relationship. * This is basically hasManyThrough for many-to-many relationships. * - * @param string $related - * @param string $through - * @param string $firstJoiningTable - * @param string $firstForeignKey - * @param string $firstRelatedKey - * @param string $secondJoiningTable - * @param string $secondForeignKey - * @param string $secondRelatedKey - * @param string $throughRelation - * @param string $relation + * @param string $related + * @param string $through + * @param string $firstJoiningTable + * @param string $firstForeignPivotKey + * @param string $firstRelatedKey + * @param string $secondJoiningTable + * @param string $secondForeignPivotKey + * @param string $secondRelatedKey + * @param string $throughRelation + * @param string $relation + * * @return BelongsToManyThrough */ public function belongsToManyThrough( $related, $through, $firstJoiningTable = null, - $firstForeignKey = null, + $firstForeignPivotKey = null, $firstRelatedKey = null, $secondJoiningTable = null, - $secondForeignKey = null, + $secondForeignPivotKey = null, $secondRelatedKey = null, $throughRelation = null, $relation = null @@ -118,7 +122,11 @@ public function belongsToManyThrough( // Create models for through and related $through = new $through(); - $related = $this->newRelatedInstance($related); + + // First, we'll need to determine the foreign key and "other key" for the + // relationship. Once we have determined the keys we'll make the query + // instances as well as the relationship instances we need for this. + $instance = $this->newRelatedInstance($related); if (is_null($throughRelation)) { $throughRelation = $through->getTable(); @@ -132,26 +140,28 @@ public function belongsToManyThrough( } if (is_null($secondJoiningTable)) { - $secondJoiningTable = $through->joiningTable($related); + $secondJoiningTable = $through->joiningTable($instance); } - $firstForeignKey = $firstForeignKey ?: $this->getForeignKey(); + $firstForeignPivotKey = $firstForeignPivotKey ?: $this->getForeignKey(); $firstRelatedKey = $firstRelatedKey ?: $through->getForeignKey(); - $secondForeignKey = $secondForeignKey ?: $through->getForeignKey(); - $secondRelatedKey = $secondRelatedKey ?: $related->getForeignKey(); + $secondForeignPivotKey = $secondForeignPivotKey ?: $through->getForeignKey(); + $secondRelatedKey = $secondRelatedKey ?: $instance->getForeignKey(); // This relationship maps the top model (this) to the through model. - $intermediateRelationship = $this->belongsToMany($through, $firstJoiningTable, $firstForeignKey, $firstRelatedKey, $throughRelation) - ->withPivot($firstForeignKey); + $intermediateRelationship = $this->belongsToMany($through, $firstJoiningTable, $firstForeignPivotKey, $firstRelatedKey, $throughRelation) + ->withPivot($firstForeignPivotKey); // Now we set up the relationship with the related model. $query = new BelongsToManyThrough( - $related->newQuery(), + $instance->newQuery(), $this, $intermediateRelationship, $secondJoiningTable, - $secondForeignKey, + $secondForeignPivotKey, $secondRelatedKey, + $this->getKeyName(), + $instance->getKeyName(), $relation ); @@ -162,14 +172,17 @@ public function belongsToManyThrough( * Define a unique many-to-many relationship. Similar to a regular many-to-many relationship, but removes duplicate child objects. * Can also be used to implement ternary relationships. * - * @param string $related - * @param string $table - * @param string $foreignKey - * @param string $relatedKey - * @param string $relation + * @param string $related + * @param string $table + * @param string $foreignPivotKey + * @param string $relatedPivotKey + * @param string $parentKey + * @param string $relatedKey + * @param string $relation + * * @return BelongsToManyUnique */ - public function belongsToManyUnique($related, $table = null, $foreignKey = null, $relatedKey = null, $relation = null) + public function belongsToManyUnique($related, $table = null, $foreignPivotKey = null, $relatedPivotKey = null, $parentKey = null, $relatedKey = null, $relation = null) { // If no relationship name was passed, we will pull backtraces to get the // name of the calling function. We will use that function name as the @@ -183,23 +196,25 @@ public function belongsToManyUnique($related, $table = null, $foreignKey = null, // instances as well as the relationship instances we need for this. $instance = $this->newRelatedInstance($related); - $foreignKey = $foreignKey ?: $this->getForeignKey(); + $foreignPivotKey = $foreignPivotKey ?: $this->getForeignKey(); - $relatedKey = $relatedKey ?: $instance->getForeignKey(); + $relatedPivotKey = $relatedPivotKey ?: $instance->getForeignKey(); // If no table name was provided, we can guess it by concatenating the two // models using underscores in alphabetical order. The two model names // are transformed to snake case from their default CamelCase also. if (is_null($table)) { - $table = $this->joiningTable($related); + $table = $this->joiningTable($related, $instance); } return new BelongsToManyUnique( $instance->newQuery(), $this, $table, - $foreignKey, - $relatedKey, + $foreignPivotKey, + $relatedPivotKey, + $parentKey ?: $this->getKeyName(), + $relatedKey ?: $instance->getKeyName(), $relation ); } @@ -207,93 +222,45 @@ public function belongsToManyUnique($related, $table = null, $foreignKey = null, /** * Define a unique morphs-to-many relationship. Similar to a regular morphs-to-many relationship, but removes duplicate child objects. * - * @param string $related - * @param string $name - * @param string $table - * @param string $foreignKey - * @param string $otherKey - * @param bool $inverse + * @param string $related + * @param string $name + * @param string $table + * @param string $foreignPivotKey + * @param string $relatedPivotKey + * @param string $parentKey + * @param string $relatedKey + * @param bool $inverse + * * @return MorphToManyUnique */ - public function morphToManyUnique($related, $name, $table = null, $foreignKey = null, $otherKey = null, $inverse = false) + public function morphToManyUnique($related, $name, $table = null, $foreignPivotKey = null, $relatedPivotKey = null, $parentKey = null, $relatedKey = null, $inverse = false) { - $caller = $this->getBelongsToManyCaller(); + $caller = $this->guessBelongsToManyRelation(); // First, we will need to determine the foreign key and "other key" for the // relationship. Once we have determined the keys we will make the query // instances, as well as the relationship instances we need for these. - $foreignKey = $foreignKey ?: $name.'_id'; + $instance = $this->newRelatedInstance($related); - $instance = new $related(); + $foreignPivotKey = $foreignPivotKey ?: $name . '_id'; - $otherKey = $otherKey ?: $instance->getForeignKey(); + $relatedPivotKey = $relatedPivotKey ?: $instance->getForeignKey(); // Now we're ready to create a new query builder for this related model and // the relationship instances for this relation. This relations will set // appropriate query constraints then entirely manages the hydrations. - $query = $instance->newQuery(); - - $table = $table ?: Str::plural($name); - - return new MorphToManyUnique( - $query, - $this, - $name, - $table, - $foreignKey, - $otherKey, - $caller, - $inverse - ); - } - - /** - * Define a constrained many-to-many relationship. - * This is similar to a regular many-to-many, but constrains the child results to match an additional constraint key in the parent object. - * This has been superseded by the belongsToManyUnique relationship's `withTernary` method since 4.1.7. - * - * @deprecated since 4.1.6 - * @param string $related - * @param string $constraintKey - * @param string $table - * @param string $foreignKey - * @param string $relatedKey - * @param string $relation - * @return BelongsToManyConstrained - */ - public function belongsToManyConstrained($related, $constraintKey, $table = null, $foreignKey = null, $relatedKey = null, $relation = null) - { - // If no relationship name was passed, we will pull backtraces to get the - // name of the calling function. We will use that function name as the - // title of this relation since that is a great convention to apply. - if (is_null($relation)) { - $relation = $this->guessBelongsToManyRelation(); - } + if (!$table) { + $words = preg_split('/(_)/u', $name, -1, PREG_SPLIT_DELIM_CAPTURE); - // First, we'll need to determine the foreign key and "other key" for the - // relationship. Once we have determined the keys we'll make the query - // instances as well as the relationship instances we need for this. - $instance = $this->newRelatedInstance($related); + $lastWord = array_pop($words); - $foreignKey = $foreignKey ?: $this->getForeignKey(); - - $relatedKey = $relatedKey ?: $instance->getForeignKey(); - - // If no table name was provided, we can guess it by concatenating the two - // models using underscores in alphabetical order. The two model names - // are transformed to snake case from their default CamelCase also. - if (is_null($table)) { - $table = $this->joiningTable($related); + $table = implode('', $words) . Str::plural($lastWord); } - return new BelongsToManyConstrained( - $instance->newQuery(), - $this, - $constraintKey, - $table, - $foreignKey, - $relatedKey, - $relation + return new MorphToManyUnique( + $instance->newQuery(), $this, $name, $table, + $foreignPivotKey, $relatedPivotKey, $parentKey ?: $this->getKeyName(), + $relatedKey ?: $instance->getKeyName(), $caller, $inverse ); } diff --git a/app/sprinkles/core/src/Database/Models/Model.php b/app/sprinkles/core/src/Database/Models/Model.php index 26ef167c1..33b7cbbb3 100644 --- a/app/sprinkles/core/src/Database/Models/Model.php +++ b/app/sprinkles/core/src/Database/Models/Model.php @@ -1,5 +1,6 @@ constraintKey = $constraintKey; - parent::__construct($query, $parent, $table, $foreignKey, $relatedKey, $relationName); - } - - /** - * Set the constraints for an eager load of the relation. - * - * @param array $models - */ - public function addEagerConstraints(array $models) - { - // To make the query more efficient, we only bother querying related models if their pivot key value - // matches the pivot key value of one of the parent models. - $pivotKeys = $this->getPivotKeys($models, $this->constraintKey); - $this->query->whereIn($this->getQualifiedForeignKeyName(), $this->getKeys($models)) - ->whereIn($this->constraintKey, $pivotKeys); - } - - /** - * Gets a list of unique pivot key values from an array of models. - * - * @param array $models - * @param string $pivotKey - * @return array - */ - protected function getPivotKeys(array $models, $pivotKey) - { - $pivotKeys = []; - foreach ($models as $model) { - $pivotKeys[] = $model->getRelation('pivot')->{$pivotKey}; - } - - return array_unique($pivotKeys); - } - - /** - * Match the eagerly loaded results to their parents, constraining the results by matching the values of $constraintKey - * in the parent object to the child objects. - * - * @see Called in https://github.com/laravel/framework/blob/2f4135d8db5ded851d1f4f611124c53b768a3c08/src/Illuminate/Database/Eloquent/Builder.php - * @param array $models - * @param \Illuminate\Database\Eloquent\Collection $results - * @param string $relation - * @return array - */ - public function match(array $models, Collection $results, $relation) - { - $dictionary = $this->buildDictionary($results); - - // Once we have an array dictionary of child objects we can easily match the - // children back to their parent using the dictionary and the keys on the - // the parent models. Then we will return the hydrated models back out. - foreach ($models as $model) { - $pivotValue = $model->getRelation('pivot')->{$this->constraintKey}; - if (isset($dictionary[$key = $model->getKey()])) { - // Only match children if their pivot key value matches that of the parent model - $items = $this->findMatchingPivots($dictionary[$key], $pivotValue); - $model->setRelation( - $relation, - $this->related->newCollection($items) - ); - } - } - - return $models; - } - - /** - * Filter an array of models, only taking models whose $constraintKey value matches $pivotValue. - * - * @param array $items - * @param mixed $pivotValue - * @return array - */ - protected function findMatchingPivots($items, $pivotValue) - { - $result = []; - foreach ($items as $item) { - if ($item->getRelation('pivot')->{$this->constraintKey} == $pivotValue) { - $result[] = $item; - } - } - - return $result; - } -} diff --git a/app/sprinkles/core/src/Database/Relations/BelongsToManyThrough.php b/app/sprinkles/core/src/Database/Relations/BelongsToManyThrough.php index 50f6dbc59..a4b70792a 100644 --- a/app/sprinkles/core/src/Database/Relations/BelongsToManyThrough.php +++ b/app/sprinkles/core/src/Database/Relations/BelongsToManyThrough.php @@ -1,5 +1,6 @@ intermediateRelation = $intermediateRelation; - parent::__construct($query, $parent, $table, $foreignKey, $relatedKey, $relationName); + parent::__construct($query, $parent, $table, $foreignPivotKey, $relatedPivotKey, $parentKey, $relatedKey, $relationName); } /** - * Use the intermediate relationship to determine the "parent" pivot key name + * Use the intermediate relationship to determine the "parent" pivot key name. * * This is a crazy roundabout way to get the name of the intermediate relation's foreign key. * It would be better if BelongsToMany had a simple accessor for its foreign key. + * * @return string */ public function getParentKeyName() @@ -67,18 +72,20 @@ public function getParentKeyName() * Get the key for comparing against the parent key in "has" query. * * @see \Illuminate\Database\Eloquent\Relations\BelongsToMany + * * @return string */ public function getExistenceCompareKey() { - return $this->intermediateRelation->getQualifiedForeignKeyName(); + return $this->intermediateRelation->getQualifiedForeignPivotKeyName(); } /** * Add a "via" query to load the intermediate models through which the child models are related. * - * @param string $viaRelationName - * @param callable $viaCallback + * @param string $viaRelationName + * @param callable $viaCallback + * * @return self */ public function withVia($viaRelationName = null, $viaCallback = null) @@ -86,7 +93,7 @@ public function withVia($viaRelationName = null, $viaCallback = null) $this->tertiaryRelated = $this->intermediateRelation->getRelated(); // Set tertiary key and related model - $this->tertiaryKey = $this->foreignKey; + $this->tertiaryKey = $this->foreignPivotKey; $this->tertiaryRelationName = is_null($viaRelationName) ? $this->intermediateRelation->getRelationName() . '_via' : $viaRelationName; @@ -107,7 +114,7 @@ public function withVia($viaRelationName = null, $viaCallback = null) public function addEagerConstraints(array $models) { // Constraint to only load models where the intermediate relation's foreign key matches the parent model - $intermediateForeignKeyName = $this->intermediateRelation->getQualifiedForeignKeyName(); + $intermediateForeignKeyName = $this->intermediateRelation->getQualifiedForeignPivotKeyName(); return $this->query->whereIn($intermediateForeignKeyName, $this->getKeys($models)); } @@ -131,11 +138,12 @@ protected function addWhereConstraints() } /** - * Match the eagerly loaded results to their parents + * Match the eagerly loaded results to their parents. + * + * @param array $models + * @param \Illuminate\Database\Eloquent\Collection $results + * @param string $relation * - * @param array $models - * @param \Illuminate\Database\Eloquent\Collection $results - * @param string $relation * @return array */ public function match(array $models, Collection $results, $relation) @@ -161,7 +169,7 @@ public function match(array $models, Collection $results, $relation) // Remove the tertiary pivot key from the condensed models foreach ($items as $relatedModel) { - unset($relatedModel->pivot->{$this->foreignKey}); + unset($relatedModel->pivot->{$this->foreignPivotKey}); } $model->setRelation( @@ -182,14 +190,15 @@ public function match(array $models, Collection $results, $relation) protected function unsetTertiaryPivots(Collection $models) { foreach ($models as $model) { - unset($model->pivot->{$this->foreignKey}); + unset($model->pivot->{$this->foreignPivotKey}); } } /** * Set the join clause for the relation query. * - * @param \Illuminate\Database\Eloquent\Builder|null $query + * @param \Illuminate\Database\Eloquent\Builder|null $query + * * @return self */ protected function performJoin($query = null) @@ -203,9 +212,9 @@ protected function performJoin($query = null) // model instance. Then we can set the "where" for the parent models. $intermediateTable = $this->intermediateRelation->getTable(); - $key = $this->intermediateRelation->getQualifiedRelatedKeyName(); + $key = $this->intermediateRelation->getQualifiedRelatedPivotKeyName(); - $query->join($intermediateTable, $key, '=', $this->getQualifiedForeignKeyName()); + $query->join($intermediateTable, $key, '=', $this->getQualifiedForeignPivotKeyName()); return $this; } @@ -219,15 +228,15 @@ protected function performJoin($query = null) */ protected function aliasedPivotColumns() { - $defaults = [$this->foreignKey, $this->relatedKey]; + $defaults = [$this->foreignPivotKey, $this->relatedPivotKey]; $aliasedPivotColumns = collect(array_merge($defaults, $this->pivotColumns))->map(function ($column) { - return $this->table.'.'.$column.' as pivot_'.$column; + return $this->table . '.' . $column . ' as pivot_' . $column; }); $parentKeyName = $this->getParentKeyName(); // Add pivot column for the intermediate relation - $aliasedPivotColumns[] = "{$this->intermediateRelation->getQualifiedForeignKeyName()} as pivot_$parentKeyName"; + $aliasedPivotColumns[] = "{$this->intermediateRelation->getQualifiedForeignPivotKeyName()} as pivot_$parentKeyName"; return $aliasedPivotColumns->unique()->all(); } diff --git a/app/sprinkles/core/src/Database/Relations/BelongsToManyUnique.php b/app/sprinkles/core/src/Database/Relations/BelongsToManyUnique.php index 60a98b799..744d7e265 100644 --- a/app/sprinkles/core/src/Database/Relations/BelongsToManyUnique.php +++ b/app/sprinkles/core/src/Database/Relations/BelongsToManyUnique.php @@ -1,5 +1,6 @@ query->getQuery()->unions) + * * @see \Illuminate\Database\Query\Builder - * @param int $value + * + * @param int $value + * * @return self */ public function offset($value) @@ -92,7 +97,8 @@ public function offset($value) /** * Alias to set the "limit" value of the query. * - * @param int $value + * @param int $value + * * @return self */ public function take($value) @@ -104,8 +110,11 @@ public function take($value) * Set the "limit" value of the query. * * @todo Implement for 'unionLimit' as well? (By checking the value of $this->query->getQuery()->unions) + * * @see \Illuminate\Database\Query\Builder - * @param int $value + * + * @param int $value + * * @return self */ public function limit($value) @@ -121,7 +130,9 @@ public function limit($value) * Set the limit on the number of intermediate models to load. * * @deprecated since 4.1.7 - * @param int $value + * + * @param int $value + * * @return $this */ public function withLimit($value) @@ -133,7 +144,9 @@ public function withLimit($value) * Set the offset when loading the intermediate models. * * @deprecated since 4.1.7 - * @param int $value + * + * @param int $value + * * @return $this */ public function withOffset($value) @@ -144,10 +157,11 @@ public function withOffset($value) /** * Add a query to load the nested tertiary models for this relationship. * - * @param string $tertiaryRelated - * @param string $tertiaryRelationName - * @param string $tertiaryKey - * @param callable $tertiaryCallback + * @param string $tertiaryRelated + * @param string $tertiaryRelationName + * @param string $tertiaryKey + * @param callable $tertiaryCallback + * * @return self */ public function withTertiary($tertiaryRelated, $tertiaryRelationName = null, $tertiaryKey = null, $tertiaryCallback = null) @@ -175,6 +189,7 @@ public function withTertiary($tertiaryRelated, $tertiaryRelationName = null, $te * Return the count of child models for this relationship. * * @see http://stackoverflow.com/a/29728129/2970321 + * * @return int */ public function count() @@ -183,15 +198,17 @@ public function count() $constrainedBuilder = $constrainedBuilder->distinct(); - return $constrainedBuilder->count($this->relatedKey); + return $constrainedBuilder->count($this->relatedPivotKey); } /** * Add the constraints for a relationship count query. * * @see \Illuminate\Database\Eloquent\Relations\Relation - * @param Builder $query - * @param Builder $parentQuery + * + * @param Builder $query + * @param Builder $parentQuery + * * @return Builder */ public function getRelationExistenceCountQuery(Builder $query, Builder $parentQuery) @@ -199,22 +216,23 @@ public function getRelationExistenceCountQuery(Builder $query, Builder $parentQu return $this->getRelationExistenceQuery( $query, $parentQuery, - new Expression("count(distinct {$this->relatedKey})") + new Expression("count(distinct {$this->relatedPivotKey})") ); } /** - * Match the eagerly loaded results to their parents + * Match the eagerly loaded results to their parents. + * + * @param array $models + * @param Collection $results + * @param string $relation * - * @param array $models - * @param Collection $results - * @param string $relation * @return array */ public function match(array $models, Collection $results, $relation) { // Build dictionary of parent (e.g. user) to related (e.g. permission) models - list($dictionary, $nestedTertiaryDictionary) = $this->buildDictionary($results, $this->foreignKey); + list($dictionary, $nestedTertiaryDictionary) = $this->buildDictionary($results, $this->foreignPivotKey); // Once we have an array dictionary of child objects we can easily match the // children back to their parent using the dictionary and the keys on the @@ -246,7 +264,8 @@ public function match(array $models, Collection $results, $relation) * Execute the query as a "select" statement, getting all requested models * and matching up any tertiary models. * - * @param array $columns + * @param array $columns + * * @return Collection */ public function get($columns = ['*']) @@ -264,9 +283,10 @@ public function get($columns = ['*']) * If we are applying either a limit or offset, we'll first determine a limited/offset list of model ids * to select from in the final query. * - * @param Builder $query - * @param int $limit - * @param int $offset + * @param Builder $query + * @param int $limit + * @param int $offset + * * @return Builder */ public function getPaginatedQuery(Builder $query, $limit = null, $offset = null) @@ -279,12 +299,12 @@ public function getPaginatedQuery(Builder $query, $limit = null, $offset = null) // Instead, we perform an additional query with grouping and limit/offset to determine // the desired set of unique model _ids_, and then constrain our final query // to these models with a whereIn clause. - $relatedKeyName = $this->related->getQualifiedKeyName(); + $relatedPivotKeyName = $this->related->getQualifiedKeyName(); // Apply an additional scope to override any selected columns in other global scopes - $uniqueIdScope = function ($subQuery) use ($relatedKeyName) { - $subQuery->addSelect($relatedKeyName) - ->groupBy($relatedKeyName); + $uniqueIdScope = function ($subQuery) use ($relatedPivotKeyName) { + $subQuery->addSelect($relatedPivotKeyName) + ->groupBy($relatedPivotKeyName); }; $identifier = spl_object_hash($uniqueIdScope); @@ -303,7 +323,7 @@ public function getPaginatedQuery(Builder $query, $limit = null, $offset = null) $modelIds = $constrainedBuilder->get()->pluck($primaryKeyName)->toArray(); // Modify the unconstrained query to limit to these models - return $query->whereIn($relatedKeyName, $modelIds); + return $query->whereIn($relatedPivotKeyName, $modelIds); } /** @@ -323,8 +343,9 @@ public function getEager() * Get the hydrated models and eager load their relations, optionally * condensing the set of models before performing the eager loads. * - * @param array $columns - * @param bool $condenseModels + * @param array $columns + * @param bool $condenseModels + * * @return Collection */ public function getModels($columns = ['*'], $condenseModels = true) @@ -370,7 +391,9 @@ public function getModels($columns = ['*'], $condenseModels = true) * * Before doing this, we may optionally find any tertiary models that should be * set as sub-relations on these models. - * @param array $models + * + * @param array $models + * * @return array */ protected function condenseModels(array $models) @@ -398,8 +421,9 @@ protected function condenseModels(array $models) * that maps parent ids to arrays of related ids, which in turn map to arrays * of tertiary models corresponding to each relationship. * - * @param Collection $results - * @param string $parentKey + * @param Collection $results + * @param string $parentKey + * * @return array */ protected function buildDictionary(Collection $results, $parentKey = null) @@ -461,7 +485,8 @@ protected function buildDictionary(Collection $results, $parentKey = null) /** * Build dictionary of tertiary models keyed by the corresponding related model keys. * - * @param array $models + * @param array $models + * * @return array */ protected function buildTertiaryDictionary(array $models) @@ -486,7 +511,7 @@ protected function buildTertiaryDictionary(array $models) } /** - * Transfer the pivot to the tertiary model + * Transfer the pivot to the tertiary model. * * @param Model $model * @param Model $tertiaryModel @@ -499,7 +524,7 @@ protected function transferPivotsToTertiary($model, $tertiaryModel) unset($model->pivot->$column); } // Copy the related key pivot as well, but don't unset on the related model - $pivotAttributes[$this->relatedKey] = $model->pivot->{$this->relatedKey}; + $pivotAttributes[$this->relatedPivotKey] = $model->pivot->{$this->relatedPivotKey}; // Set the tertiary key pivot as well $pivotAttributes[$this->tertiaryKey] = $tertiaryModel->getKey(); @@ -511,7 +536,8 @@ protected function transferPivotsToTertiary($model, $tertiaryModel) /** * Get the tertiary models for the relationship. * - * @param array $models + * @param array $models + * * @return Collection */ protected function getTertiaryModels(array $models) diff --git a/app/sprinkles/core/src/Database/Relations/HasManySyncable.php b/app/sprinkles/core/src/Database/Relations/HasManySyncable.php index ca35e93b6..c7d4aedbb 100644 --- a/app/sprinkles/core/src/Database/Relations/HasManySyncable.php +++ b/app/sprinkles/core/src/Database/Relations/HasManySyncable.php @@ -1,5 +1,6 @@ ci->locator->listResources($this->scheme, false, false); - + return $this->loadSeeders($seeds); } /** - * Get a single seed info + * Get a single seed info. + * + * @param string $name The seed name * - * @param string $name The seed name * @throws \Exception If seed not found - * @return array The details about a seed file [name, class, sprinkle] + * + * @return array The details about a seed file [name, class, sprinkle] */ public function getSeed($name) { @@ -76,10 +79,12 @@ public function getSeed($name) } /** - * Return the class instance of a seed + * Return the class instance of a seed. + * + * @param string $name The seed name + * + * @throws \Exception If class doesn't exist or is not right interface * - * @param string $name The seed name - * @throws \Exception If class doesn't exist or is not right interface * @return SeedInterface The seed class instance */ public function getSeedClass($name) @@ -105,7 +110,7 @@ public function getSeedClass($name) } /** - * Execute a seed class + * Execute a seed class. * * @param SeedInterface $seed The seed to execute */ @@ -115,7 +120,7 @@ public function executeSeed(SeedInterface $seed) } /** - * Execute a seed based on it's name + * Execute a seed based on it's name. * * @param string $seedName */ @@ -126,9 +131,10 @@ public function execute($seedName) } /** - * Process seeder Resource into info + * Process seeder Resource into info. + * + * @param array $seedFiles List of seeds file * - * @param array $seedFiles List of seeds file * @return array */ protected function loadSeeders(array $seedFiles) @@ -142,10 +148,11 @@ protected function loadSeeders(array $seedFiles) } /** - * Return an array of seed details inclusing the classname and the sprinkle name + * Return an array of seed details inclusing the classname and the sprinkle name. + * + * @param ResourceInstance $file The seed file * - * @param ResourceInstance $file The seed file - * @return array The details about a seed file [name, class, sprinkle] + * @return array The details about a seed file [name, class, sprinkle] */ protected function getSeedDetails(ResourceInstance $file) { @@ -162,7 +169,7 @@ protected function getSeedDetails(ResourceInstance $file) return [ 'name' => $name, 'class' => "\\UserFrosting\\Sprinkle\\$sprinkleName\\Database\\Seeds\\$className", - 'sprinkle' => $sprinkleName + 'sprinkle' => $sprinkleName, ]; } } diff --git a/app/sprinkles/core/src/Error/ExceptionHandlerManager.php b/app/sprinkles/core/src/Error/ExceptionHandlerManager.php index 544b83b92..3cbab50db 100755 --- a/app/sprinkles/core/src/Error/ExceptionHandlerManager.php +++ b/app/sprinkles/core/src/Error/ExceptionHandlerManager.php @@ -1,5 +1,6 @@ withStatus($httpCode) ->withHeader('Content-type', $this->contentType) ->write($template->render([ - 'messages' => $messages + 'messages' => $messages, ])); } /** - * Write to the error log + * Write to the error log. */ public function writeToErrorLog() { @@ -189,9 +190,10 @@ public function writeAlerts() /** * Determine which renderer to use based on content type - * Overloaded $renderer from calling class takes precedence over all + * Overloaded $renderer from calling class takes precedence over all. * * @throws \RuntimeException + * * @return \UserFrosting\Sprinkle\Core\Error\Renderer\ErrorRendererInterface */ protected function determineRenderer() @@ -255,12 +257,12 @@ protected function determineStatusCode() protected function determineUserMessages() { return [ - new UserMessage('ERROR.SERVER') + new UserMessage('ERROR.SERVER'), ]; } /** - * Monolog logging for errors + * Monolog logging for errors. * * @param string $message */ diff --git a/app/sprinkles/core/src/Error/Handler/ExceptionHandlerInterface.php b/app/sprinkles/core/src/Error/Handler/ExceptionHandlerInterface.php index b6146e412..2f113b0b3 100644 --- a/app/sprinkles/core/src/Error/Handler/ExceptionHandlerInterface.php +++ b/app/sprinkles/core/src/Error/Handler/ExceptionHandlerInterface.php @@ -1,5 +1,6 @@ setEditor('sublime'); * - * @param string|callable $editor + * @param string|callable $editor + * * @throws InvalidArgumentException If invalid argument identifier provided */ public function setEditor($editor) @@ -443,9 +451,11 @@ public function setEditor($editor) * a string that may be used as the href property for that * file reference. * - * @param string $filePath - * @param int $line + * @param string $filePath + * @param int $line + * * @throws InvalidArgumentException If editor resolver does not return a string + * * @return string|bool */ public function getEditorHref($filePath, $line) @@ -473,11 +483,13 @@ public function getEditorHref($filePath, $line) /** * Given a boolean if the editor link should * act as an Ajax request. The editor must be a - * valid callable function/closure + * valid callable function/closure. + * + * @param string $filePath + * @param int $line * - * @param string $filePath - * @param int $line * @throws UnexpectedValueException If editor resolver does not return a boolean + * * @return bool */ public function getEditorAjax($filePath, $line) @@ -514,7 +526,8 @@ public function getPageTitle() * Adds a path to the list of paths to be searched for * resources. * - * @param string $path + * @param string $path + * * @throws InvalidArgumentException If $path is not a valid directory */ public function addResourcePath($path) @@ -548,6 +561,7 @@ public function getResourcePaths() /** * @deprecated + * * @return string */ public function getResourcesPath() @@ -560,6 +574,7 @@ public function getResourcesPath() /** * @deprecated + * * @param string $resourcesPath */ public function setResourcesPath($resourcesPath) @@ -600,10 +615,11 @@ public function setApplicationRootPath($applicationRootPath) /** * Given a boolean if the editor link should * act as an Ajax request. The editor must be a - * valid callable function/closure + * valid callable function/closure. + * + * @param string $filePath + * @param int $line * - * @param string $filePath - * @param int $line * @return array */ protected function getEditor($filePath, $line) @@ -664,8 +680,10 @@ protected function getInspector() * way back to the first, enabling a cascading-type system of overrides * for all resources. * - * @param string $resource + * @param string $resource + * * @throws RuntimeException If resource cannot be found in any of the available paths + * * @return string */ protected function getResource($resource) @@ -692,7 +710,7 @@ protected function getResource($resource) // If we got this far, nothing was found. throw new RuntimeException( "Could not find resource '$resource' in any resource paths." - . '(searched: ' . join(', ', $this->searchPaths). ')' + . '(searched: ' . implode(', ', $this->searchPaths) . ')' ); } @@ -702,9 +720,10 @@ protected function getResource($resource) * * We intentionally dont rely on $GLOBALS as it depends on 'auto_globals_jit' php.ini setting. * - * @param array $superGlobal One of the superglobal arrays - * @param string $superGlobalName the name of the superglobal array, e.g. '_GET' - * @return array $values without sensitive data + * @param array $superGlobal One of the superglobal arrays + * @param string $superGlobalName the name of the superglobal array, e.g. '_GET' + * + * @return array $values without sensitive data */ private function masked(array $superGlobal, $superGlobalName) { diff --git a/app/sprinkles/core/src/Error/Renderer/XmlRenderer.php b/app/sprinkles/core/src/Error/Renderer/XmlRenderer.php index ac3c0e267..8430e3793 100755 --- a/app/sprinkles/core/src/Error/Renderer/XmlRenderer.php +++ b/app/sprinkles/core/src/Error/Renderer/XmlRenderer.php @@ -1,5 +1,6 @@ cc[] = [ 'email' => $email, - 'name' => $name + 'name' => $name, ]; } @@ -81,7 +82,7 @@ public function bcc($email, $name = '') { $this->bcc[] = [ 'email' => $email, - 'name' => $name + 'name' => $name, ]; } diff --git a/app/sprinkles/core/src/Mail/MailMessage.php b/app/sprinkles/core/src/Mail/MailMessage.php index 6f0542a26..48b598b0b 100644 --- a/app/sprinkles/core/src/Mail/MailMessage.php +++ b/app/sprinkles/core/src/Mail/MailMessage.php @@ -1,5 +1,6 @@ phpMailer->Password = $config['password']; $this->phpMailer->SMTPDebug = $config['smtp_debug']; + // Disable opportunistic encryption if secure is unset. This is + // required if you have an incorrect or invalid SSL Certificate on + // your SMTP host, but the server offers STARTTLS. + if (!$config['secure']) { + $this->phpMailer->SMTPAutoTLS = false; + } + if (isset($config['smtp_options'])) { $this->phpMailer->SMTPOptions = $config['smtp_options']; } @@ -100,8 +109,10 @@ public function getPhpMailer() * * Sends a single email to all recipients, as well as their CCs and BCCs. * Since it is a single-header message, recipient-specific template data will not be included. - * @param MailMessage $message - * @param bool $clearRecipients Set to true to clear the list of recipients in the message after calling send(). This helps avoid accidentally sending a message multiple times. + * + * @param MailMessage $message + * @param bool $clearRecipients Set to true to clear the list of recipients in the message after calling send(). This helps avoid accidentally sending a message multiple times. + * * @throws \phpmailerException The message could not be sent. */ public function send(MailMessage $message, $clearRecipients = true) @@ -148,8 +159,10 @@ public function send(MailMessage $message, $clearRecipients = true) * Send a MailMessage message, sending a separate email to each recipient. * * If the message object supports message templates, this will render the template with the corresponding placeholder values for each recipient. - * @param MailMessage $message - * @param bool $clearRecipients Set to true to clear the list of recipients in the message after calling send(). This helps avoid accidentally sending a message multiple times. + * + * @param MailMessage $message + * @param bool $clearRecipients Set to true to clear the list of recipients in the message after calling send(). This helps avoid accidentally sending a message multiple times. + * * @throws \phpmailerException The message could not be sent. */ public function sendDistinct(MailMessage $message, $clearRecipients = true) @@ -195,7 +208,8 @@ public function sendDistinct(MailMessage $message, $clearRecipients = true) /** * Set option(s) on the underlying phpMailer object. * - * @param mixed[] $options + * @param mixed[] $options + * * @return Mailer */ public function setOptions($options) diff --git a/app/sprinkles/core/src/Mail/StaticMailMessage.php b/app/sprinkles/core/src/Mail/StaticMailMessage.php index 2085a8a9d..8fd9c0504 100644 --- a/app/sprinkles/core/src/Mail/StaticMailMessage.php +++ b/app/sprinkles/core/src/Mail/StaticMailMessage.php @@ -1,5 +1,6 @@ config; if ($config['alert.storage'] == 'cache') { - return new CacheAlertStream($config['alert.key'], $c->translator, $c->cache, $c->config); + return new CacheAlertStream($config['alert.key'], $c->translator, $c->cache, $c->session->getId()); } elseif ($config['alert.storage'] == 'session') { return new SessionAlertStream($config['alert.key'], $c->translator, $c->session); } else { @@ -96,7 +97,7 @@ public function register(ContainerInterface $container) } }; - /** + /* * Asset loader service * * Loads assets from a specified relative location. @@ -109,7 +110,7 @@ public function register(ContainerInterface $container) return new AssetLoader($c->assets); }; - /** + /* * Asset manager service. * * Loads raw or compiled asset information from your bundle.config.json schema file. @@ -153,21 +154,23 @@ public function register(ContainerInterface $container) } else { // Register compiled assets stream in public folder + alias for vendor ones + build stream for CompiledAssetBundles - $c->locator->registerStream('assets', '', \UserFrosting\PUBLIC_DIR_NAME . '/' . \UserFrosting\ASSET_DIR_NAME, true); - $c->locator->registerStream('assets', 'vendor', \UserFrosting\PUBLIC_DIR_NAME . '/' . \UserFrosting\ASSET_DIR_NAME, true); - $c->locator->registerStream('build', '', \UserFrosting\BUILD_DIR_NAME, true); + $locator->registerStream('assets', '', \UserFrosting\PUBLIC_DIR_NAME . '/' . \UserFrosting\ASSET_DIR_NAME, true); + $locator->registerStream('assets', 'vendor', \UserFrosting\PUBLIC_DIR_NAME . '/' . \UserFrosting\ASSET_DIR_NAME, true); + $locator->registerStream('build', '', \UserFrosting\BUILD_DIR_NAME, true); $baseUrl = $config['site.uri.public'] . '/' . $config['assets.compiled.path']; $assets = new Assets($locator, 'assets', $baseUrl); // Load compiled asset bundle. - $assets->addAssetBundles(new CompiledAssetBundles($locator('build://' . $config['assets.compiled.schema'], true, true))); + $path = $locator->findResource('build://' . $config['assets.compiled.schema'], true, true); + $bundles = new CompiledAssetBundles($path); + $assets->addAssetBundles($bundles); } return $assets; }; - /** + /* * Cache service. * * @throws \Exception If cache handler is not supported @@ -194,7 +197,7 @@ public function register(ContainerInterface $container) return $cacheStore->instance(); }; - /** + /* * Middleware to check environment. * * @todo We should cache the results of this, the first time that it succeeds. @@ -205,7 +208,7 @@ public function register(ContainerInterface $container) return new CheckEnvironment($c->view, $c->locator, $c->cache); }; - /** + /* * Class mapper. * * Creates an abstraction on top of class names to allow extending them in sprinkles. @@ -221,7 +224,7 @@ public function register(ContainerInterface $container) return $classMapper; }; - /** + /* * Site config service (separate from Slim settings). * * Will attempt to automatically determine which config file(s) to use based on the value of the UF_MODE environment variable. @@ -257,7 +260,7 @@ public function register(ContainerInterface $container) // See https://github.com/laravel/framework/issues/8172#issuecomment-99112012 for more information on why it's bad to hit Laravel sessions multiple times in rapid succession. $csrfBlacklist = $config['csrf.blacklist']; $csrfBlacklist['^/' . $config['assets.raw.path']] = [ - 'GET' + 'GET', ]; $config->set('csrf.blacklist', $csrfBlacklist); @@ -265,18 +268,18 @@ public function register(ContainerInterface $container) return $config; }; - /** + /* * Initialize CSRF guard middleware. * * @see https://github.com/slimphp/Slim-Csrf - * @throws BadRequestException + * @throws \UserFrosting\Support\Exception\BadRequestException * @return \Slim\Csrf\Guard */ $container['csrf'] = function ($c) { return SlimCsrfProvider::setupService($c); }; - /** + /* * Initialize Eloquent Capsule, which provides the database layer for UF. * * @todo construct the individual objects rather than using the facade @@ -313,7 +316,7 @@ public function register(ContainerInterface $container) $logger->debug("Query executed on database [{$query->connectionName}]:", [ 'query' => $query->sql, 'bindings' => $query->bindings, - 'time' => $query->time . ' ms' + 'time' => $query->time . ' ms', ]); }); } @@ -321,7 +324,7 @@ public function register(ContainerInterface $container) return $capsule; }; - /** + /* * Debug logging with Monolog. * * Extend this service to push additional handlers onto the 'debug' log stack. @@ -343,7 +346,7 @@ public function register(ContainerInterface $container) return $logger; }; - /** + /* * Custom error-handler for recoverable errors. * * @return \UserFrosting\Sprinkle\Core\Error\ExceptionHandlerManager @@ -365,7 +368,7 @@ public function register(ContainerInterface $container) return $handler; }; - /** + /* * Error logging with Monolog. * * Extend this service to push additional handlers onto the 'error' log stack. @@ -387,7 +390,7 @@ public function register(ContainerInterface $container) return $log; }; - /** + /* * Factory service with FactoryMuffin. * * Provide access to factories for the rapid creation of objects for the purpose of testing @@ -411,7 +414,7 @@ public function register(ContainerInterface $container) return $fm; }; - /** + /* * Filesystem Service * @return \UserFrosting\Sprinkle\Core\Filesystem\FilesystemManager */ @@ -419,7 +422,7 @@ public function register(ContainerInterface $container) return new FilesystemManager($c->config); }; - /** + /* * Builds search paths for locales in all Sprinkles. * * @throws \UnexpectedValueException @@ -478,7 +481,7 @@ public function register(ContainerInterface $container) return new LocalePathBuilder($c->locator, 'locale://', $locales); }; - /** + /* * Mail service. * * @return \UserFrosting\Sprinkle\Core\Mail\Mailer @@ -494,7 +497,7 @@ public function register(ContainerInterface $container) return $mailer; }; - /** + /* * Mail logging service. * * PHPMailer will use this to log SMTP activity. @@ -516,7 +519,7 @@ public function register(ContainerInterface $container) return $log; }; - /** + /* * Migrator service. * * This service handles database migration operations @@ -538,7 +541,7 @@ public function register(ContainerInterface $container) return $migrator; }; - /** + /* * Error-handler for 404 errors. Notice that we manually create a UserFrosting NotFoundException, * and a NotFoundExceptionHandler. This lets us pass through to the UF error handling system. * @@ -553,7 +556,7 @@ public function register(ContainerInterface $container) }; }; - /** + /* * Error-handler for PHP runtime errors. Notice that we just pass this through to our general-purpose * error-handling service. * @@ -563,7 +566,7 @@ public function register(ContainerInterface $container) return $c->errorHandler; }; - /** + /* * Laravel query logging with Monolog. * * Extend this service to push additional handlers onto the 'query' log stack. @@ -585,7 +588,7 @@ public function register(ContainerInterface $container) return $logger; }; - /** + /* * Override Slim's default router with the UF router. * * @return \UserFrosting\Sprinkle\Core\Router @@ -600,7 +603,7 @@ public function register(ContainerInterface $container) return (new Router())->setCacheFile($routerCacheFile); }; - /** + /* * Return an instance of the database seeder * * @return \UserFrosting\Sprinkle\Core\Database\Seeder\Seeder @@ -609,7 +612,7 @@ public function register(ContainerInterface $container) return new Seeder($c); }; - /** + /* * Start the PHP session, with the name and parameters specified in the configuration file. * * @throws \Exception @@ -639,7 +642,7 @@ public function register(ContainerInterface $container) return $session; }; - /** + /* * Request throttler. * * Throttles (rate-limits) requests of a predefined type, with rules defined in site config. @@ -665,7 +668,7 @@ public function register(ContainerInterface $container) return $throttler; }; - /** + /* * Translation service, for translating message tokens. * * @return \UserFrosting\I18n\MessageTranslator @@ -681,7 +684,7 @@ public function register(ContainerInterface $container) return $translator; }; - /** + /* * Set up Twig as the view, adding template paths for all sprinkles and the Slim Twig extension. * * Also adds the UserFrosting core Twig extension, which provides additional functions, filters, global variables, etc. diff --git a/app/sprinkles/core/src/Session/DatabaseSessionHandler.php b/app/sprinkles/core/src/Session/DatabaseSessionHandler.php new file mode 100644 index 000000000..3208009f6 --- /dev/null +++ b/app/sprinkles/core/src/Session/DatabaseSessionHandler.php @@ -0,0 +1,44 @@ +getQuery()->find($sessionId); + + if ($this->expired($session)) { + $this->exists = true; + + return ''; + } + + if (isset($session->payload)) { + $this->exists = true; + + return base64_decode($session->payload); + } + + return ''; + } +} diff --git a/app/sprinkles/core/src/Session/NullSessionHandler.php b/app/sprinkles/core/src/Session/NullSessionHandler.php index 42e737348..e5d3512af 100644 --- a/app/sprinkles/core/src/Session/NullSessionHandler.php +++ b/app/sprinkles/core/src/Session/NullSessionHandler.php @@ -1,5 +1,6 @@ [], 'size' => 'all', 'page' => null, - 'format' => 'json' + 'format' => 'json', ]; /** @@ -148,6 +148,7 @@ public function __construct(ClassMapper $classMapper, array $options) $e->addUserMessage($error); } } + throw $e; } @@ -164,7 +165,8 @@ public function __construct(ClassMapper $classMapper, array $options) /** * Extend the query by providing a callback. * - * @param callable $callback A callback which accepts and returns a Builder instance. + * @param callable $callback A callback which accepts and returns a Builder instance. + * * @return self */ public function extendQuery(callable $callback) @@ -177,7 +179,8 @@ public function extendQuery(callable $callback) /** * Execute the query and build the results, and append them in the appropriate format to the response. * - * @param Response $response + * @param Response $response + * * @return Response */ public function toResponse(Response $response) @@ -188,9 +191,7 @@ public function toResponse(Response $response) $result = $this->getCsv(); // Prepare response - $settings = http_build_query($this->options); - $date = Carbon::now()->format('Ymd'); - $response = $response->withAddedHeader('Content-Disposition', "attachment;filename=$date-{$this->name}-$settings.csv"); + $response = $response->withAddedHeader('Content-Disposition', "attachment;filename={$this->name}.csv"); $response = $response->withAddedHeader('Content-Type', 'text/csv; charset=utf-8'); return $response->write($result); @@ -207,6 +208,7 @@ public function toResponse(Response $response) * * Returns an array containing `count` (the total number of rows, before filtering), `count_filtered` (the total number of rows after filtering), * and `rows` (the filtered result set). + * * @return mixed[] */ public function getArray() @@ -218,7 +220,7 @@ public function getArray() $this->countKey => $count, $this->countFilteredKey => $countFiltered, $this->rowsKey => $rows->values()->toArray(), - $this->listableKey => $this->getListable() + $this->listableKey => $this->getListable(), ]; } @@ -283,6 +285,7 @@ public function getCsv() * Executes the sprunje query, applying all sorts, filters, and pagination. * * Returns the filtered, paginated result set and the counts. + * * @return mixed[] */ public function getModels() @@ -324,7 +327,7 @@ public function getListable() foreach ($this->listable as $name) { // Determine if a custom filter method has been defined - $methodName = 'list'.studly_case($name); + $methodName = 'list' . studly_case($name); if (method_exists($this, $methodName)) { $result[$name] = $this->$methodName(); @@ -349,7 +352,8 @@ public function getQuery() /** * Set the underlying QueryBuilder object. * - * @param Builder $query + * @param Builder $query + * * @return self */ public function setQuery($query) @@ -362,7 +366,8 @@ public function setQuery($query) /** * Apply any filters from the options, calling a custom filter callback when appropriate. * - * @param Builder $query + * @param Builder $query + * * @return self */ public function applyFilters($query) @@ -372,6 +377,7 @@ public function applyFilters($query) if (($name != '_all') && !in_array($name, $this->filterable)) { $e = new BadRequestException(); $e->addUserMessage('VALIDATE.SPRUNJE.BAD_FILTER', ['name' => $name]); + throw $e; } // Since we want to match _all_ of the fields, we wrap the field callback in a 'where' callback @@ -386,7 +392,8 @@ public function applyFilters($query) /** * Apply any sorts from the options, calling a custom sorter callback when appropriate. * - * @param Builder $query + * @param Builder $query + * * @return self */ public function applySorts($query) @@ -396,11 +403,12 @@ public function applySorts($query) if (!in_array($name, $this->sortable)) { $e = new BadRequestException(); $e->addUserMessage('VALIDATE.SPRUNJE.BAD_SORT', ['name' => $name]); + throw $e; } // Determine if a custom sort method has been defined - $methodName = 'sort'.studly_case($name); + $methodName = 'sort' . studly_case($name); if (method_exists($this, $methodName)) { $this->$methodName($query, $direction); @@ -415,7 +423,8 @@ public function applySorts($query) /** * Apply pagination based on the `page` and `size` options. * - * @param Builder $query + * @param Builder $query + * * @return self */ public function applyPagination($query) @@ -436,8 +445,9 @@ public function applyPagination($query) /** * Match any filter in `filterable`. * - * @param Builder $query - * @param mixed $value + * @param Builder $query + * @param mixed $value + * * @return self */ protected function filterAll($query, $value) @@ -457,14 +467,15 @@ protected function filterAll($query, $value) /** * Build the filter query for a single field. * - * @param Builder $query - * @param string $name - * @param mixed $value + * @param Builder $query + * @param string $name + * @param mixed $value + * * @return self */ protected function buildFilterQuery($query, $name, $value) { - $methodName = 'filter'.studly_case($name); + $methodName = 'filter' . studly_case($name); // Determine if a custom filter method has been defined if (method_exists($this, $methodName)) { @@ -480,9 +491,10 @@ protected function buildFilterQuery($query, $name, $value) * Perform a 'like' query on a single field, separating the value string on the or separator and * matching any of the supplied values. * - * @param Builder $query - * @param string $name - * @param mixed $value + * @param Builder $query + * @param string $name + * @param mixed $value + * * @return self */ protected function buildFilterDefaultFieldQuery($query, $name, $value) @@ -500,7 +512,8 @@ protected function buildFilterDefaultFieldQuery($query, $name, $value) /** * Set any transformations you wish to apply to the collection, after the query is executed. * - * @param \Illuminate\Database\Eloquent\Collection $collection + * @param \Illuminate\Database\Eloquent\Collection $collection + * * @return \Illuminate\Database\Eloquent\Collection */ protected function applyTransformations($collection) @@ -519,7 +532,8 @@ abstract protected function baseQuery(); * Returns a list of distinct values for a specified column. * Formats results to have a "value" and "text" attribute. * - * @param string $column + * @param string $column + * * @return array */ protected function getColumnValues($column) @@ -529,7 +543,7 @@ protected function getColumnValues($column) foreach ($rawValues as $raw) { $values[] = [ 'value' => $raw[$column], - 'text' => $raw[$column] + 'text' => $raw[$column], ]; } @@ -539,7 +553,8 @@ protected function getColumnValues($column) /** * Get the unpaginated count of items (before filtering) in this query. * - * @param Builder $query + * @param Builder $query + * * @return int */ protected function count($query) @@ -550,7 +565,8 @@ protected function count($query) /** * Get the unpaginated count of items (after filtering) in this query. * - * @param Builder $query + * @param Builder $query + * * @return int */ protected function countFiltered($query) @@ -563,7 +579,9 @@ protected function countFiltered($query) * * Returns an array containing `count` (the total number of rows, before filtering), `count_filtered` (the total number of rows after filtering), * and `rows` (the filtered result set). + * * @deprecated since 4.1.7 Use getArray() instead. + * * @return mixed[] */ public function getResults() diff --git a/app/sprinkles/core/src/Throttle/ThrottleRule.php b/app/sprinkles/core/src/Throttle/ThrottleRule.php index 0c39d596d..f2d23d34a 100644 --- a/app/sprinkles/core/src/Throttle/ThrottleRule.php +++ b/app/sprinkles/core/src/Throttle/ThrottleRule.php @@ -1,5 +1,6 @@ getMethod() == 'ip') { - $events = $this->classMapper->staticMethod('throttle', 'where', 'type', $type) + $events = $this->classMapper->getClassMapping('throttle')::where('type', $type) ->where('created_at', '>', $startTime) ->where('ip', $_SERVER['REMOTE_ADDR']) ->get(); } else { - $events = $this->classMapper->staticMethod('throttle', 'where', 'type', $type) + $events = $this->classMapper->getClassMapping('throttle')::where('type', $type) ->where('created_at', '>', $startTime) ->get(); @@ -111,8 +113,10 @@ public function getDelay($type, $requestData = []) /** * Get a registered rule of a particular type. * - * @param string $type + * @param string $type + * * @throws ThrottlerException + * * @return ThrottleRule[] */ public function getRule($type) @@ -152,7 +156,7 @@ public function logEvent($type, $requestData = []) $event = $this->classMapper->createInstance('throttle', [ 'type' => $type, 'ip' => $_SERVER['REMOTE_ADDR'], - 'request_data' => json_encode($requestData) + 'request_data' => json_encode($requestData), ]); $event->save(); @@ -163,9 +167,10 @@ public function logEvent($type, $requestData = []) /** * Returns the current delay for a specified throttle rule. * - * @param Collection $events a Collection of throttle events. - * @param ThrottleRule $throttleRule a rule representing the strategy to use for throttling a particular type of event. - * @return int seconds remaining until a particular event is permitted to be attempted again. + * @param Collection $events a Collection of throttle events. + * @param ThrottleRule $throttleRule a rule representing the strategy to use for throttling a particular type of event. + * + * @return int seconds remaining until a particular event is permitted to be attempted again. */ protected function computeDelay(Collection $events, ThrottleRule $throttleRule) { diff --git a/app/sprinkles/core/src/Throttle/ThrottlerException.php b/app/sprinkles/core/src/Throttle/ThrottlerException.php index 3bfefd2ee..022c0723a 100644 --- a/app/sprinkles/core/src/Throttle/ThrottlerException.php +++ b/app/sprinkles/core/src/Throttle/ThrottlerException.php @@ -1,5 +1,6 @@ services['translator']->translate($hook, $params); }, [ - 'is_safe' => ['html'] - ]) + 'is_safe' => ['html'], + ]), ]; } @@ -88,7 +89,7 @@ public function getFilters() }), new \Twig_SimpleFilter('unescape', function ($string) { return html_entity_decode($string); - }) + }), ]; } @@ -109,18 +110,18 @@ public function getGlobals() 'csrf' => [ 'keys' => [ 'name' => $csrfNameKey, - 'value' => $csrfValueKey + 'value' => $csrfValueKey, ], 'name' => $csrfName, - 'value' => $csrfValue - ] + 'value' => $csrfValue, + ], ]; $site = array_replace_recursive($this->services->config['site'], $csrf); return [ 'site' => $site, - 'assets' => new AssetsTemplatePlugin($this->services->assets) + 'assets' => new AssetsTemplatePlugin($this->services->assets), ]; } } diff --git a/app/sprinkles/core/src/Util/BadClassNameException.php b/app/sprinkles/core/src/Util/BadClassNameException.php index 7e3ce4c58..02d17230a 100644 --- a/app/sprinkles/core/src/Util/BadClassNameException.php +++ b/app/sprinkles/core/src/Util/BadClassNameException.php @@ -1,5 +1,6 @@ resultsFailed, $this->resultsSuccess); $response = $this->view->render($response, 'pages/error/config-errors.html.twig', [ - 'messages' => $results + 'messages' => $results, ]); } else { $response = $next($request, $response); @@ -125,6 +127,12 @@ public function checkAll() $problemsFound = true; } + if ($this->checkDirectories()) { + $problemsFound = true; + // Skip checkPermissions() if the required directories do not exist. + return $problemsFound; + } + if ($this->checkPermissions()) { $problemsFound = true; } @@ -152,13 +160,13 @@ public function checkApache() $this->resultsFailed['apache-' . $module] = [ 'title' => " Missing Apache module $module.", 'message' => "Please make sure that the $module Apache module is installed and enabled. If you use shared hosting, you will need to ask your web host to do this for you.", - 'success' => false + 'success' => false, ]; } else { $this->resultsSuccess['apache-' . $module] = [ 'title' => " Apache module $module is installed and enabled.", 'message' => "Great, we found the $module Apache module!", - 'success' => true + 'success' => true, ]; } } @@ -179,13 +187,13 @@ public function checkGd() $this->resultsFailed['gd'] = [ 'title' => " GD library not installed", 'message' => 'We could not confirm that the GD library is installed and enabled. GD is an image processing library that UserFrosting uses to generate captcha codes for user account registration.', - 'success' => false + 'success' => false, ]; } else { $this->resultsSuccess['gd'] = [ 'title' => " GD library installed!", 'message' => 'Great, you have GD installed and enabled.', - 'success' => true + 'success' => true, ]; } @@ -209,7 +217,7 @@ public function checkImageFunctions() 'imageline', 'imagesetpixel', 'imagefontwidth', - 'imagestring' + 'imagestring', ]; foreach ($funcs as $func) { @@ -218,13 +226,13 @@ public function checkImageFunctions() $this->resultsFailed['function-' . $func] = [ 'title' => " Missing image manipulation function.", 'message' => "It appears that function $func is not available. UserFrosting needs this to render captchas.", - 'success' => false + 'success' => false, ]; } else { $this->resultsSuccess['function-' . $func] = [ 'title' => " Function $func is available!", 'message' => 'Sweet!', - 'success' => true + 'success' => true, ]; } } @@ -244,14 +252,47 @@ public function checkPdo() $this->resultsFailed['pdo'] = [ 'title' => " PDO is not installed.", 'message' => "I'm sorry, you must have PDO installed and enabled in order for UserFrosting to access the database. If you don't know what PDO is, please see http://php.net/manual/en/book.pdo.php.", - 'success' => false + 'success' => false, ]; } else { $this->resultsSuccess['pdo'] = [ 'title' => " PDO is installed!", 'message' => "You've got PDO installed. Good job!", - 'success' => true + 'success' => true, + ]; + } + + return $problemsFound; + } + + /** + * Check that log, cache, and session directories exist. + */ + public function checkDirectories() + { + $problemsFound = false; + + $directoryPaths = [ + 'logs' => $this->locator->findResource('log://'), + 'cache' => $this->locator->findResource('cache://'), + 'sessions' => $this->locator->findResource('session://'), + ]; + + foreach ($directoryPaths as $directory => $path) { + if ($path == null) { + $problemsFound = true; + $this->resultsFailed['directory-' . $directory] = [ + 'title' => " A required directory was not found.", + 'message' => "Please check that userfrosting/app/$directory exists.", + 'success' => false, ]; + } else { + $this->resultsSuccess['directory-' . $directory] = [ + 'title' => " File/directory check passed!", + 'message' => "userfrosting/app/$directory exists.", + 'success' => true, + ]; + } } return $problemsFound; @@ -267,32 +308,23 @@ public function checkPermissions() $shouldBeWriteable = [ $this->locator->findResource('log://') => true, $this->locator->findResource('cache://') => true, - $this->locator->findResource('session://') => true + $this->locator->findResource('session://') => true, ]; if ($this->isProduction()) { // Should be write-protected in production! $shouldBeWriteable = array_merge($shouldBeWriteable, [ \UserFrosting\SPRINKLES_DIR => false, - \UserFrosting\VENDOR_DIR => false + \UserFrosting\VENDOR_DIR => false, ]); } // Check for essential files & perms foreach ($shouldBeWriteable as $file => $assertWriteable) { - $is_dir = false; - if (!file_exists($file)) { + $writeable = is_writable($file); + if ($assertWriteable !== $writeable) { $problemsFound = true; $this->resultsFailed['file-' . $file] = [ - 'title' => " File or directory does not exist.", - 'message' => "We could not find the file or directory $file.", - 'success' => false - ]; - } else { - $writeable = is_writable($file); - if ($assertWriteable !== $writeable) { - $problemsFound = true; - $this->resultsFailed['file-' . $file] = [ 'title' => " Incorrect permissions for file or directory.", 'message' => "$file is " . ($writeable ? 'writeable' : 'not writeable') @@ -301,17 +333,16 @@ public function checkPermissions() . '. Please modify the OS user or group permissions so that user ' . exec('whoami') . ' ' . ($assertWriteable ? 'has' : 'does not have') . ' write permissions for this directory.', - 'success' => false + 'success' => false, ]; - } else { - $this->resultsSuccess['file-' . $file] = [ + } else { + $this->resultsSuccess['file-' . $file] = [ 'title' => " File/directory check passed!", 'message' => "$file exists and is correctly set as " . ($writeable ? 'writeable' : 'not writeable') . '.', - 'success' => true + 'success' => true, ]; - } } } @@ -331,13 +362,19 @@ public function checkPhp() $this->resultsFailed['phpVersion'] = [ 'title' => " You need to upgrade your PHP installation.", 'message' => "I'm sorry, UserFrosting requires version " . \UserFrosting\PHP_MIN_VERSION . ' or greater. Please upgrade your version of PHP, or contact your web hosting service and ask them to upgrade it for you.', - 'success' => false + 'success' => false, ]; } else { $this->resultsSuccess['phpVersion'] = [ +<<<<<<< HEAD 'title' => " PHP version checks out!", 'message' => "You're using PHP " . \UserFrosting\PHP_MIN_VERSION . 'or higher. Great!', 'success' => true +======= + 'title' => " PHP version checks out!", + 'message' => "You're using PHP " . \UserFrosting\PHP_MIN_VERSION . 'or higher. Great!', + 'success' => true, +>>>>>>> 35ec97cae43efc785e14e9168882f7816281a625 ]; } diff --git a/app/sprinkles/core/src/Util/ClassMapper.php b/app/sprinkles/core/src/Util/ClassMapper.php index b7314e781..c20e3202e 100644 --- a/app/sprinkles/core/src/Util/ClassMapper.php +++ b/app/sprinkles/core/src/Util/ClassMapper.php @@ -1,5 +1,6 @@ 'Parse error', E_CORE_ERROR => 'PHP core error', E_COMPILE_ERROR => 'Zend compile error', - E_RECOVERABLE_ERROR => 'Catchable fatal error' + E_RECOVERABLE_ERROR => 'Catchable fatal error', ]; return '' . $errorTypes[$error['type']] . ": $errstr in $errfile on line $errline"; @@ -122,7 +124,8 @@ protected function buildErrorInfoMessage(array $error) /** * Build an error response of the appropriate type as determined by the request's Accept header. * - * @param string $message + * @param string $message + * * @return string */ protected function buildErrorPage($message) @@ -147,7 +150,8 @@ protected function buildErrorPage($message) /** * Build an HTML error page from an error string. * - * @param string $message + * @param string $message + * * @return string */ protected function buildHtmlErrorPage($message) diff --git a/app/sprinkles/core/src/Util/Util.php b/app/sprinkles/core/src/Util/Util.php index 9cd14008a..b51dbf616 100644 --- a/app/sprinkles/core/src/Util/Util.php +++ b/app/sprinkles/core/src/Util/Util.php @@ -1,5 +1,6 @@ '.str_repeat('  ', $newLineLevel); + $result .= '
          ' . str_repeat('  ', $newLineLevel); } - $result .= $char.$post; + $result .= $char . $post; } return $result; @@ -148,10 +153,11 @@ public static function prettyPrintArray(array $arr) /** * Generate a random phrase, consisting of a specified number of adjectives, followed by a noun. * - * @param int $numAdjectives - * @param int $maxLength - * @param int $maxTries - * @param string $separator + * @param int $numAdjectives + * @param int $maxLength + * @param int $maxTries + * @param string $separator + * * @return string */ public static function randomPhrase($numAdjectives, $maxLength = 9999999, $maxTries = 10, $separator = '-') diff --git a/app/sprinkles/core/tests/ControllerTestCase.php b/app/sprinkles/core/tests/ControllerTestCase.php index da67cdda3..961c39ba8 100644 --- a/app/sprinkles/core/tests/ControllerTestCase.php +++ b/app/sprinkles/core/tests/ControllerTestCase.php @@ -1,5 +1,6 @@ setupTestDatabase(); $this->refreshDatabase(); } - - /** - * @param array $args Request arguments - * @return Request - */ - protected function getRequest($args = []) - { - $env = Environment::mock($args); - - return Request::createFromEnvironment($env); - } - - /** - * @return Response - */ - protected function getResponse() - { - return new Response(); - } } diff --git a/app/sprinkles/core/tests/DatabaseTransactions.php b/app/sprinkles/core/tests/DatabaseTransactions.php index 668905e1c..0fc331b24 100644 --- a/app/sprinkles/core/tests/DatabaseTransactions.php +++ b/app/sprinkles/core/tests/DatabaseTransactions.php @@ -1,5 +1,6 @@ $command->getName() + 'command' => $command->getName(), ], $input); // Execute command tester diff --git a/app/sprinkles/core/tests/Integration/BakeryMigrateRefreshCommandTest.php b/app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateRefreshCommandTest.php similarity index 95% rename from app/sprinkles/core/tests/Integration/BakeryMigrateRefreshCommandTest.php rename to app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateRefreshCommandTest.php index 58e3cb8a0..f8b3208f3 100644 --- a/app/sprinkles/core/tests/Integration/BakeryMigrateRefreshCommandTest.php +++ b/app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateRefreshCommandTest.php @@ -1,5 +1,6 @@ $command->getName() + 'command' => $command->getName(), ], $input); // Execute command tester diff --git a/app/sprinkles/core/tests/Integration/BakeryMigrateResetCommandTest.php b/app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateResetCommandTest.php similarity index 96% rename from app/sprinkles/core/tests/Integration/BakeryMigrateResetCommandTest.php rename to app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateResetCommandTest.php index 7a995c319..242b65290 100644 --- a/app/sprinkles/core/tests/Integration/BakeryMigrateResetCommandTest.php +++ b/app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateResetCommandTest.php @@ -1,5 +1,6 @@ $command->getName() + 'command' => $command->getName(), ], $input); // Execute command tester diff --git a/app/sprinkles/core/tests/Integration/BakeryMigrateRollbackCommandTest.php b/app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateRollbackCommandTest.php similarity index 96% rename from app/sprinkles/core/tests/Integration/BakeryMigrateRollbackCommandTest.php rename to app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateRollbackCommandTest.php index 6aba5a97d..6484d88d9 100644 --- a/app/sprinkles/core/tests/Integration/BakeryMigrateRollbackCommandTest.php +++ b/app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateRollbackCommandTest.php @@ -1,5 +1,6 @@ $command->getName() + 'command' => $command->getName(), ], $input); // Execute command tester diff --git a/app/sprinkles/core/tests/Integration/BakeryMigrateStatusCommandTest.php b/app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateStatusCommandTest.php similarity index 96% rename from app/sprinkles/core/tests/Integration/BakeryMigrateStatusCommandTest.php rename to app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateStatusCommandTest.php index da0a83177..de1018c89 100644 --- a/app/sprinkles/core/tests/Integration/BakeryMigrateStatusCommandTest.php +++ b/app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateStatusCommandTest.php @@ -1,5 +1,6 @@ $command->getName() + 'command' => $command->getName(), ], $input); // Execute command tester @@ -99,7 +103,7 @@ protected function getInstalledMigrationStub() { return collect([ (object) ['migration' => 'foo', 'batch' => 1, 'sprinkle' => 'foo'], - (object) ['migration' => 'bar', 'batch' => 2, 'sprinkle' => 'bar'] + (object) ['migration' => 'bar', 'batch' => 2, 'sprinkle' => 'bar'], ]); } } diff --git a/app/sprinkles/core/tests/Integration/Controllers/CoreControllerTest.php b/app/sprinkles/core/tests/Integration/Controllers/CoreControllerTest.php index f8dc0415c..33bd93a12 100644 --- a/app/sprinkles/core/tests/Integration/Controllers/CoreControllerTest.php +++ b/app/sprinkles/core/tests/Integration/Controllers/CoreControllerTest.php @@ -1,5 +1,6 @@ expectException(NotFoundException::class); $controller->getAsset($this->getRequest(), $this->getResponse(), []); } /** * @depends testControllerConstructor - * @expectedException \UserFrosting\Support\Exception\NotFoundException * @param CoreController $controller */ public function testGetAsset_ExceptionBadUrl(CoreController $controller) { + $this->expectException(NotFoundException::class); $url = '/' . rand(0, 99999); $controller->getAsset($this->getRequest(), $this->getResponse(), ['url' => $url]); } + /** + * @depends testControllerConstructor + * @param CoreController $controller + */ + public function testGetAsset_ExceptionEmptyUrl(CoreController $controller) + { + $this->expectException(NotFoundException::class); + $controller->getAsset($this->getRequest(), $this->getResponse(), ['url' => '']); + } + /** * @depends testControllerConstructor * @depends testGetAsset_ExceptionNoUrl @@ -78,10 +90,6 @@ public function testGetAsset_ExceptionBadUrl(CoreController $controller) */ public function testGetAsset(CoreController $controller) { - $result = $controller->getAsset($this->getRequest(), $this->getResponse(), ['url' => '']); - $this->assertSame($result->getStatusCode(), 200); - $this->assertSame('', (string) $result->getBody()); - $result = $controller->getAsset($this->getRequest(), $this->getResponse(), ['url' => 'userfrosting/js/uf-alerts.js']); $this->assertSame($result->getStatusCode(), 200); $this->assertNotEmpty((string) $result->getBody()); diff --git a/app/sprinkles/core/tests/Integration/DatabaseTests.php b/app/sprinkles/core/tests/Integration/Database/DatabaseTests.php similarity index 85% rename from app/sprinkles/core/tests/Integration/DatabaseTests.php rename to app/sprinkles/core/tests/Integration/Database/DatabaseTests.php index f7a44e67a..47e28b051 100644 --- a/app/sprinkles/core/tests/Integration/DatabaseTests.php +++ b/app/sprinkles/core/tests/Integration/Database/DatabaseTests.php @@ -1,5 +1,6 @@ 'David']); $user->emails()->create([ 'label' => 'primary', - 'email' => 'david@owlfancy.com' + 'email' => 'david@owlfancy.com', ]); $user->emails()->create([ 'label' => 'work', - 'email' => 'david@attenboroughsreef.com' + 'email' => 'david@attenboroughsreef.com', ]); $emails = $user->emails; @@ -163,24 +164,24 @@ public function testSyncOneToMany() $user->emails()->create([ 'id' => 1, 'label' => 'primary', - 'email' => 'david@owlfancy.com' + 'email' => 'david@owlfancy.com', ]); $user->emails()->create([ 'id' => 2, 'label' => 'work', - 'email' => 'david@attenboroughsreef.com' + 'email' => 'david@attenboroughsreef.com', ]); // Delete `work`, update `primary`, and add `gmail` $user->emails()->sync([ [ 'id' => 1, - 'email' => 'david@aol.com' + 'email' => 'david@aol.com', ], [ 'label' => 'gmail', - 'email' => 'davidattenborough@gmail.com' - ] + 'email' => 'davidattenborough@gmail.com', + ], ]); $emails = $user->emails->toArray(); @@ -190,14 +191,14 @@ public function testSyncOneToMany() 'id' => 1, 'user_id'=> 1, 'label' => 'primary', - 'email' => 'david@aol.com' + 'email' => 'david@aol.com', ], [ 'id' => 3, 'user_id' => 1, 'label' => 'gmail', - 'email' => 'davidattenborough@gmail.com' - ] + 'email' => 'davidattenborough@gmail.com', + ], ], $emails); } @@ -211,24 +212,24 @@ public function testSyncMorphMany() $user->phones()->create([ 'id' => 1, 'label' => 'primary', - 'number' => '5555551212' + 'number' => '5555551212', ]); $user->phones()->create([ 'id' => 2, 'label' => 'work', - 'number' => '2223334444' + 'number' => '2223334444', ]); // Delete `work`, update `primary`, and add `fax` $user->phones()->sync([ [ 'id' => 1, - 'number' => '8883332222' + 'number' => '8883332222', ], [ 'label' => 'fax', - 'number' => '5550005555' - ] + 'number' => '5550005555', + ], ]); $phones = $user->phones->toArray(); @@ -239,15 +240,15 @@ public function testSyncMorphMany() 'phoneable_id' => 1, 'phoneable_type' => EloquentTestUser::class, 'label' => 'primary', - 'number' => '8883332222' + 'number' => '8883332222', ], [ 'id' => 3, 'phoneable_id' => 1, 'phoneable_type' => EloquentTestUser::class, 'label' => 'fax', - 'number' => '5550005555' - ] + 'number' => '5550005555', + ], ], $phones); } @@ -268,17 +269,17 @@ public function testBelongsToManyUnique() 'slug' => 'soldier', 'pivot' => [ 'user_id' => 1, - 'role_id' => 2 - ] + 'role_id' => 2, + ], ], [ 'id' => 3, 'slug' => 'egg-layer', 'pivot' => [ 'user_id' => 1, - 'role_id' => 3 - ] - ] + 'role_id' => 3, + ], + ], ]; $roles = $user->jobRoles; @@ -291,6 +292,7 @@ public function testBelongsToManyUnique() /** * testMorphsToManyUnique + * @depends testBelongsToManyUnique */ public function testMorphsToManyUnique() { @@ -306,18 +308,20 @@ public function testMorphsToManyUnique() 'id' => 2, 'name' => 'Chopping', 'pivot' => [ - 'assignable_id' => 1, - 'task_id' => 2 - ] + 'assignable_id' => 1, + 'task_id' => 2, + 'assignable_type' => EloquentTestUser::class, + ], ], [ 'id' => 3, 'name' => 'Baleing', 'pivot' => [ - 'assignable_id' => 1, - 'task_id' => 3 - ] - ] + 'assignable_id' => 1, + 'task_id' => 3, + 'assignable_type' => EloquentTestUser::class, + ], + ], ]; $tasks = $user->assignmentTasks; @@ -330,6 +334,7 @@ public function testMorphsToManyUnique() /** * testMorphsToManyUniqueWithTertiary + * @depends testMorphsToManyUnique */ public function testMorphsToManyUniqueWithTertiary() { @@ -345,8 +350,9 @@ public function testMorphsToManyUniqueWithTertiary() 'id' => 2, 'name' => 'Chopping', 'pivot' => [ - 'assignable_id' => 1, - 'task_id' => 2 + 'assignable_id' => 1, + 'task_id' => 2, + 'assignable_type' => EloquentTestUser::class, ], 'locations' => [ [ @@ -354,7 +360,7 @@ public function testMorphsToManyUniqueWithTertiary() 'name' => 'Hatchery', 'pivot' => [ 'location_id' => 1, - 'task_id' => 2 + 'task_id' => 2, ], ], [ @@ -362,17 +368,18 @@ public function testMorphsToManyUniqueWithTertiary() 'name' => 'Nexus', 'pivot' => [ 'location_id' => 2, - 'task_id' => 2 + 'task_id' => 2, ], - ] - ] + ], + ], ], [ 'id' => 3, 'name' => 'Baleing', 'pivot' => [ - 'assignable_id' => 1, - 'task_id' => 3 + 'assignable_id' => 1, + 'task_id' => 3, + 'assignable_type' => EloquentTestUser::class, ], 'locations' => [ [ @@ -380,11 +387,11 @@ public function testMorphsToManyUniqueWithTertiary() 'name' => 'Nexus', 'pivot' => [ 'location_id' => 2, - 'task_id' => 3 + 'task_id' => 3, ], - ] - ] - ] + ], + ], + ], ]; $tasks = $user->tasks; @@ -397,6 +404,7 @@ public function testMorphsToManyUniqueWithTertiary() /** * testBelongsToManyUniqueWithTertiary + * @depends testBelongsToManyUnique */ public function testBelongsToManyUniqueWithTertiary() { @@ -412,7 +420,7 @@ public function testBelongsToManyUniqueWithTertiary() 'slug' => 'soldier', 'pivot' => [ 'user_id' => 1, - 'role_id' => 2 + 'role_id' => 2, ], 'locations' => [ [ @@ -421,8 +429,8 @@ public function testBelongsToManyUniqueWithTertiary() 'pivot' => [ 'title' => 'Grunt', 'location_id' => 1, - 'role_id' => 2 - ] + 'role_id' => 2, + ], ], [ 'id' => 2, @@ -430,17 +438,17 @@ public function testBelongsToManyUniqueWithTertiary() 'pivot' => [ 'title' => 'Sergeant', 'location_id' => 2, - 'role_id' => 2 - ] - ] - ] + 'role_id' => 2, + ], + ], + ], ], [ 'id' => 3, 'slug' => 'egg-layer', 'pivot' => [ 'user_id' => 1, - 'role_id' => 3 + 'role_id' => 3, ], 'locations' => [ [ @@ -449,11 +457,11 @@ public function testBelongsToManyUniqueWithTertiary() 'pivot' => [ 'title' => 'Queen', 'location_id' => 2, - 'role_id' => 3 - ] - ] - ] - ] + 'role_id' => 3, + ], + ], + ], + ], ]; $jobs = $user->jobs()->withPivot('title')->get(); @@ -469,6 +477,7 @@ public function testBelongsToManyUniqueWithTertiary() /** * testBelongsToManyUniqueWithTertiaryEagerLoad + * @depends testBelongsToManyUniqueWithTertiary */ public function testBelongsToManyUniqueWithTertiaryEagerLoad() { @@ -491,7 +500,7 @@ public function testBelongsToManyUniqueWithTertiaryEagerLoad() 'slug' => 'soldier', 'pivot' => [ 'user_id' => 1, - 'role_id' => 2 + 'role_id' => 2, ], 'locations' => [ [ @@ -499,25 +508,25 @@ public function testBelongsToManyUniqueWithTertiaryEagerLoad() 'name' => 'Hatchery', 'pivot' => [ 'location_id' => 1, - 'role_id' => 2 - ] + 'role_id' => 2, + ], ], [ 'id' => 2, 'name' => 'Nexus', 'pivot' => [ 'location_id' => 2, - 'role_id' => 2 - ] - ] - ] + 'role_id' => 2, + ], + ], + ], ], [ 'id' => 3, 'slug' => 'egg-layer', 'pivot' => [ 'user_id' => 1, - 'role_id' => 3 + 'role_id' => 3, ], 'locations' => [ [ @@ -525,12 +534,12 @@ public function testBelongsToManyUniqueWithTertiaryEagerLoad() 'name' => 'Nexus', 'pivot' => [ 'location_id' => 2, - 'role_id' => 3 - ] - ] - ] - ] - ] + 'role_id' => 3, + ], + ], + ], + ], + ], ], [ 'id' => 2, @@ -541,7 +550,7 @@ public function testBelongsToManyUniqueWithTertiaryEagerLoad() 'slug' => 'egg-layer', 'pivot' => [ 'user_id' => 2, - 'role_id' => 3 + 'role_id' => 3, ], 'locations' => [ [ @@ -549,13 +558,13 @@ public function testBelongsToManyUniqueWithTertiaryEagerLoad() 'name' => 'Hatchery', 'pivot' => [ 'location_id' => 1, - 'role_id' => 3 - ] + 'role_id' => 3, + ], ], - ] - ] - ] - ] + ], + ], + ], + ], ], $users->toArray()); } @@ -571,31 +580,32 @@ public function testBelongsToManyThrough() $user->roles()->attach([1, 2]); // Test retrieval of via models as well + // This user won't have `uri_royal_jelly` slug $this->assertEquals([ [ 'id' => 1, 'slug' => 'uri_harvest', 'pivot' => [ 'user_id' => 1, - 'permission_id' => 1 - ] + 'permission_id' => 1, + ], ], [ 'id' => 2, 'slug' => 'uri_spit_acid', 'pivot' => [ 'user_id' => 1, - 'permission_id' => 2 - ] + 'permission_id' => 2, + ], ], [ 'id' => 3, 'slug' => 'uri_slash', 'pivot' => [ 'user_id' => 1, - 'permission_id' => 3 - ] - ] + 'permission_id' => 3, + ], + ], ], $user->permissions->toArray()); // Test counting @@ -614,25 +624,25 @@ public function testBelongsToManyThrough() 'slug' => 'uri_spit_acid', 'pivot' => [ 'user_id' => 2, - 'permission_id' => 2 - ] + 'permission_id' => 2, + ], ], [ 'id' => 3, 'slug' => 'uri_slash', 'pivot' => [ 'user_id' => 2, - 'permission_id' => 3 - ] + 'permission_id' => 3, + ], ], [ 'id' => 4, 'slug' => 'uri_royal_jelly', 'pivot' => [ 'user_id' => 2, - 'permission_id' => 4 - ] - ] + 'permission_id' => 4, + ], + ], ], $usersWithPermissions[1]['permissions']); // Test counting related models (withCount) @@ -647,6 +657,7 @@ public function testBelongsToManyThrough() /** * Test the ability of a BelongsToManyThrough relationship to retrieve and count paginated queries. + * @depends testBelongsToManyThrough */ public function testBelongsToManyThroughPaginated() { @@ -664,17 +675,17 @@ public function testBelongsToManyThroughPaginated() 'slug' => 'uri_spit_acid', 'pivot' => [ 'user_id' => 1, - 'permission_id' => 2 - ] + 'permission_id' => 2, + ], ], [ 'id' => 3, 'slug' => 'uri_slash', 'pivot' => [ 'user_id' => 1, - 'permission_id' => 3 - ] - ] + 'permission_id' => 3, + ], + ], ], $paginatedPermissions->get()->toArray()); $this->assertEquals(2, $paginatedPermissions->count()); @@ -683,6 +694,7 @@ public function testBelongsToManyThroughPaginated() /** * Test the ability of a BelongsToManyThrough relationship to retrieve and count paginated queries, * when we need to reference a virtual/computed column (for example in a sort). + * @depends testBelongsToManyThrough */ public function testBelongsToManyThroughPaginatedWithOrderByAggregateColumn() { @@ -703,15 +715,16 @@ public function testBelongsToManyThroughPaginatedWithOrderByAggregateColumn() 'roles_count' => 3, 'pivot' => [ 'user_id' => 1, - 'permission_id' => 2 - ] - ] + 'permission_id' => 2, + ], + ], ], $paginatedPermissions->get()->toArray()); } /** * Test the ability of a BelongsToManyThrough relationship to retrieve structured data on a single model or set of models, * eager loading the "via" models at the same time. + * @depends testBelongsToManyThrough */ public function testBelongsToManyThroughWithVia() { @@ -752,12 +765,13 @@ public function testQueryExclude() $this->assertEquals([ 'role_id' => 2, - 'user_id' => 1 + 'user_id' => 1, ], $job->toArray()); } /** * testQueryExcludeOnJoinedTable + * @depends testQueryExclude */ public function testQueryExcludeOnJoinedTable() { @@ -780,30 +794,31 @@ public function testQueryExcludeOnJoinedTable() 'id' => 1, 'pivot' => [ 'user_id' => 1, - 'permission_id' => 1 - ] + 'permission_id' => 1, + ], ], [ 'id' => 2, 'pivot' => [ 'user_id' => 1, - 'permission_id' => 2 - ] + 'permission_id' => 2, + ], ], [ 'id' => 3, 'pivot' => [ 'user_id' => 1, - 'permission_id' => 3 - ] - ] - ] - ] + 'permission_id' => 3, + ], + ], + ], + ], ], $users->toArray()); } /** * testQueryExcludeUseQualifiedNamesOnJoinedTable + * @depends testQueryExclude */ public function testQueryExcludeUseQualifiedNamesOnJoinedTable() { @@ -828,24 +843,25 @@ public function testQueryExcludeUseQualifiedNamesOnJoinedTable() 'title' => null, 'pivot' => [ 'user_id' => 1, - 'role_id' => 1 - ] + 'role_id' => 1, + ], ], [ 'id' => 2, 'title' => null, 'pivot' => [ 'user_id' => 1, - 'role_id' => 2 - ] - ] - ] - ] + 'role_id' => 2, + ], + ], + ], + ], ], $users->toArray()); } /** * testQueryExcludeWildcard + * @depends testQueryExclude */ public function testQueryExcludeWildcard() { @@ -854,19 +870,19 @@ public function testQueryExcludeWildcard() $job = EloquentTestJob::select('*')->addSelect('user_id')->exclude('*')->first(); $this->assertEquals([ - 'user_id' => 1 + 'user_id' => 1, ], $job->toArray()); $job = EloquentTestJob::select('jobs.*')->addSelect('user_id')->exclude('*')->first(); $this->assertEquals([ - 'user_id' => 1 + 'user_id' => 1, ], $job->toArray()); $job = EloquentTestJob::select('*')->addSelect('user_id')->exclude('jobs.*')->first(); $this->assertEquals([ - 'user_id' => 1 + 'user_id' => 1, ], $job->toArray()); } @@ -904,18 +920,18 @@ protected function generateRoles() return [ EloquentTestRole::create([ 'id' => 1, - 'slug' => 'forager' + 'slug' => 'forager', ]), EloquentTestRole::create([ 'id' => 2, - 'slug' => 'soldier' + 'slug' => 'soldier', ]), EloquentTestRole::create([ 'id' => 3, - 'slug' => 'egg-layer' - ]) + 'slug' => 'egg-layer', + ]), ]; } @@ -927,23 +943,23 @@ protected function generatePermissions() return [ EloquentTestPermission::create([ 'id' => 1, - 'slug' => 'uri_harvest' + 'slug' => 'uri_harvest', ]), EloquentTestPermission::create([ 'id' => 2, - 'slug' => 'uri_spit_acid' + 'slug' => 'uri_spit_acid', ]), EloquentTestPermission::create([ 'id' => 3, - 'slug' => 'uri_slash' + 'slug' => 'uri_slash', ]), EloquentTestPermission::create([ 'id' => 4, - 'slug' => 'uri_royal_jelly' - ]) + 'slug' => 'uri_royal_jelly', + ]), ]; } @@ -986,26 +1002,26 @@ protected function generateJobs() 'role_id' => 2, 'location_id' => 1, 'user_id' => 1, - 'title' => 'Grunt' + 'title' => 'Grunt', ]), EloquentTestJob::create([ 'role_id' => 2, 'location_id' => 2, 'user_id' => 1, - 'title' => 'Sergeant' + 'title' => 'Sergeant', ]), EloquentTestJob::create([ 'role_id' => 3, 'location_id' => 2, 'user_id' => 1, - 'title' => 'Queen' + 'title' => 'Queen', ]), EloquentTestJob::create([ 'role_id' => 3, 'location_id' => 1, 'user_id' => 2, - 'title' => 'Demi-queen' - ]) + 'title' => 'Demi-queen', + ]), ]; } @@ -1017,13 +1033,13 @@ protected function generateLocations() return [ EloquentTestLocation::create([ 'id' => 1, - 'name' => 'Hatchery' + 'name' => 'Hatchery', ]), EloquentTestLocation::create([ 'id' => 2, - 'name' => 'Nexus' - ]) + 'name' => 'Nexus', + ]), ]; } @@ -1035,18 +1051,18 @@ protected function generateTasks() return [ EloquentTestTask::create([ 'id' => 1, - 'name' => 'Digging' + 'name' => 'Digging', ]), EloquentTestTask::create([ 'id' => 2, - 'name' => 'Chopping' + 'name' => 'Chopping', ]), EloquentTestTask::create([ 'id' => 3, - 'name' => 'Baleing' - ]) + 'name' => 'Baleing', + ]), ]; } @@ -1060,32 +1076,32 @@ protected function generateAssignments() 'task_id' => 2, 'location_id' => 1, 'assignable_id' => 1, - 'assignable_type' => EloquentTestUser::class + 'assignable_type' => EloquentTestUser::class, ]), EloquentTestAssignment::create([ 'task_id' => 2, 'location_id' => 2, 'assignable_id' => 1, - 'assignable_type' => EloquentTestUser::class + 'assignable_type' => EloquentTestUser::class, ]), EloquentTestAssignment::create([ 'task_id' => 3, 'location_id' => 2, 'assignable_id' => 1, - 'assignable_type' => EloquentTestUser::class + 'assignable_type' => EloquentTestUser::class, ]), EloquentTestAssignment::create([ 'task_id' => 3, 'location_id' => 3, 'assignable_id' => 1, - 'assignable_type' => 'UserFrosting\Tests\Integration\EloquentTestNonExistant' + 'assignable_type' => 'UserFrosting\Tests\Integration\EloquentTestNonExistant', ]), EloquentTestAssignment::create([ 'task_id' => 3, 'location_id' => 1, 'assignable_id' => 2, - 'assignable_type' => EloquentTestUser::class - ]) + 'assignable_type' => EloquentTestUser::class, + ]), ]; } @@ -1104,9 +1120,9 @@ protected function assertBelongsToManyThroughForDavid($permissions) 'slug' => 'forager', 'pivot' => [ 'permission_id' => 1, - 'role_id' => 1 - ] - ] + 'role_id' => 1, + ], + ], ], $permissions[0]['roles_via']); $this->assertEquals('uri_spit_acid', $permissions[1]['slug']); $this->assertEquals([ @@ -1115,17 +1131,17 @@ protected function assertBelongsToManyThroughForDavid($permissions) 'slug' => 'forager', 'pivot' => [ 'permission_id' => 2, - 'role_id' => 1 - ] + 'role_id' => 1, + ], ], [ 'id' => 2, 'slug' => 'soldier', 'pivot' => [ 'permission_id' => 2, - 'role_id' => 2 - ] - ] + 'role_id' => 2, + ], + ], ], $permissions[1]['roles_via']); $this->assertEquals('uri_slash', $permissions[2]['slug']); $this->assertEquals([ @@ -1134,9 +1150,9 @@ protected function assertBelongsToManyThroughForDavid($permissions) 'slug' => 'soldier', 'pivot' => [ 'permission_id' => 3, - 'role_id' => 2 - ] - ] + 'role_id' => 2, + ], + ], ], $permissions[2]['roles_via']); } @@ -1155,17 +1171,17 @@ protected function assertBelongsToManyThroughForAlex($permissions) 'slug' => 'soldier', 'pivot' => [ 'permission_id' => 2, - 'role_id' => 2 - ] + 'role_id' => 2, + ], ], [ 'id' => 3, 'slug' => 'egg-layer', 'pivot' => [ 'permission_id' => 2, - 'role_id' => 3 - ] - ] + 'role_id' => 3, + ], + ], ], $permissions[0]['roles_via']); $this->assertEquals('uri_slash', $permissions[1]['slug']); $this->assertEquals([ @@ -1174,9 +1190,9 @@ protected function assertBelongsToManyThroughForAlex($permissions) 'slug' => 'soldier', 'pivot' => [ 'permission_id' => 3, - 'role_id' => 2 - ] - ] + 'role_id' => 2, + ], + ], ], $permissions[1]['roles_via']); $this->assertEquals('uri_royal_jelly', $permissions[2]['slug']); $this->assertEquals([ @@ -1185,9 +1201,9 @@ protected function assertBelongsToManyThroughForAlex($permissions) 'slug' => 'egg-layer', 'pivot' => [ 'permission_id' => 4, - 'role_id' => 3 - ] - ] + 'role_id' => 3, + ], + ], ], $permissions[2]['roles_via']); } } diff --git a/app/sprinkles/core/tests/Integration/DatabaseMigratorIntegrationTest.php b/app/sprinkles/core/tests/Integration/Database/Migrator/DatabaseMigratorIntegrationTest.php similarity index 98% rename from app/sprinkles/core/tests/Integration/DatabaseMigratorIntegrationTest.php rename to app/sprinkles/core/tests/Integration/Database/Migrator/DatabaseMigratorIntegrationTest.php index a68530d29..981c2a40f 100644 --- a/app/sprinkles/core/tests/Integration/DatabaseMigratorIntegrationTest.php +++ b/app/sprinkles/core/tests/Integration/Database/Migrator/DatabaseMigratorIntegrationTest.php @@ -1,5 +1,6 @@ assertEquals([ - '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable', ], $migrated); } @@ -307,7 +311,7 @@ public function getMigrations() { return [ '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable', - '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', ]; } } @@ -317,7 +321,7 @@ class FlightsTableMigrationLocatorStub extends MigrationLocator public function getMigrations() { return [ - '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable', ]; } } @@ -330,7 +334,7 @@ class InvalidMigrationLocatorStub extends MigrationLocator public function getMigrations() { return [ - '\\UserFrosting\\Tests\\Integration\\Migrations\\Foo' + '\\UserFrosting\\Tests\\Integration\\Migrations\\Foo', ]; } } @@ -347,7 +351,7 @@ public function getMigrations() return [ '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable', '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable', - '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', ]; } } @@ -363,7 +367,7 @@ public function getMigrations() return [ '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable', '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', - '\\UserFrosting\\Tests\\Integration\\Migrations\\UnfulfillableTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\UnfulfillableTable', ]; } } @@ -377,7 +381,7 @@ class DeprecatedMigrationLocatorStub extends MigrationLocator public function getMigrations() { return [ - '\\UserFrosting\\Tests\\Integration\\Migrations\\DeprecatedClassTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\DeprecatedClassTable', ]; } } diff --git a/app/sprinkles/core/tests/Integration/Database/Migrator/DatabaseMigratorServiceTest.php b/app/sprinkles/core/tests/Integration/Database/Migrator/DatabaseMigratorServiceTest.php new file mode 100644 index 000000000..fb8def415 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/Database/Migrator/DatabaseMigratorServiceTest.php @@ -0,0 +1,27 @@ +assertInstanceOf(Migrator::class, $this->ci->migrator); + } +} diff --git a/app/sprinkles/core/tests/Integration/DatabaseMigratorTest.php b/app/sprinkles/core/tests/Integration/Database/Migrator/DatabaseMigratorTest.php similarity index 97% rename from app/sprinkles/core/tests/Integration/DatabaseMigratorTest.php rename to app/sprinkles/core/tests/Integration/Database/Migrator/DatabaseMigratorTest.php index c0134ad7e..c2aa2aa83 100644 --- a/app/sprinkles/core/tests/Integration/DatabaseMigratorTest.php +++ b/app/sprinkles/core/tests/Integration/Database/Migrator/DatabaseMigratorTest.php @@ -1,5 +1,6 @@ locator->shouldReceive('getMigrations')->andReturn([ '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable', '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', - '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable', ]); // Repository will be asked to return the ran migrations (one), the next batch number and will log 2 new migrations $this->repository->shouldReceive('getMigrationsList')->andReturn([ - '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable', ]); $this->repository->shouldReceive('getNextBatchNumber')->andReturn(2); $this->repository->shouldReceive('log')->times(2)->andReturn(null); @@ -166,7 +167,7 @@ public function testMigratorUpWithOneInstalledMigrations() // The migration already ran shoudn't be in the pending ones $this->assertEquals([ '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', - '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable', ], $migrations); } @@ -179,7 +180,7 @@ public function testMigratorUpWithNoPendingMigrations() $testMigrations = [ '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable', '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', - '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable', ]; // When running up, Locator will return all 3 migration classes @@ -229,7 +230,7 @@ public function testMigratorRollbackAllInstalledMigrations() $testMigrations = [ '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable', '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', - '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable', ]; // When running up, Locator will return all 3 migration classes @@ -262,14 +263,14 @@ public function testMigratorRollbackAllInstalledMigrationsWithOneMissing() { // Locator will only return one of the two installed migrations $this->locator->shouldReceive('getMigrations')->once()->andReturn([ - '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', ]); // Repository will be asked to return the ran migrations (two of them) // and will only be asked to delete one $installed = [ '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable', - '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', ]; $this->repository->shouldReceive('getLast')->once()->andReturn($installed); $this->repository->shouldReceive('getMigrationsList')->once()->andReturn($installed); @@ -288,7 +289,7 @@ public function testMigratorRollbackAllInstalledMigrationsWithOneMissing() // The migration not available from the locator shouldn't have been run dowm $this->assertEquals([ - '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', ], $migrations); } @@ -301,13 +302,13 @@ public function testMigratorRollbackSpecific() $testMigrations = [ '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable', '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', - '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable', ]; // Migration object for the one being deleted $migration = '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable'; $migrationObject = (object) [ - 'migration' => $migration + 'migration' => $migration, ]; // Locator will return all 3 migration classes as available @@ -342,13 +343,13 @@ public function testMigratorRollbackSpecificWithDependencies() $testMigrations = [ '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable', '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', - '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable', ]; // Migration object for the one being deleted $migration = '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable'; $migrationObject = (object) [ - 'migration' => $migration + 'migration' => $migration, ]; // Locator will return all 3 migration classes as available @@ -381,7 +382,7 @@ public function testMigratorResetAllInstalledMigrations() $testMigrations = [ '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable', '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', - '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable', ]; // Locator will return all 3 migration classes diff --git a/app/sprinkles/core/tests/Integration/MigrationDependencyAnalyserTest.php b/app/sprinkles/core/tests/Integration/Database/Migrator/MigrationDependencyAnalyserTest.php similarity index 92% rename from app/sprinkles/core/tests/Integration/MigrationDependencyAnalyserTest.php rename to app/sprinkles/core/tests/Integration/Database/Migrator/MigrationDependencyAnalyserTest.php index 5a72ab04d..72b5362a0 100644 --- a/app/sprinkles/core/tests/Integration/MigrationDependencyAnalyserTest.php +++ b/app/sprinkles/core/tests/Integration/Database/Migrator/MigrationDependencyAnalyserTest.php @@ -1,5 +1,6 @@ assertEquals([], $analyser->getUnfulfillable()); $this->assertEquals([ '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable', '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', - '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\two\\CreateFlightsTable', ], $analyser->getFulfillable()); } @@ -66,18 +67,18 @@ public function testAnalyserWithUnfulfillable() $migrations = [ '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable', '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', - '\\UserFrosting\\Tests\\Integration\\Migrations\\UnfulfillableTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\UnfulfillableTable', ]; $analyser = new MigrationDependencyAnalyser($migrations, []); $this->assertEquals([ '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreateUsersTable', - '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable' + '\\UserFrosting\\Tests\\Integration\\Migrations\\one\\CreatePasswordResetsTable', ], $analyser->getFulfillable()); $this->assertEquals([ - '\\UserFrosting\\Tests\\Integration\\Migrations\\UnfulfillableTable' => '\UserFrosting\Tests\Integration\Migrations\NonExistingMigration' + '\\UserFrosting\\Tests\\Integration\\Migrations\\UnfulfillableTable' => '\UserFrosting\Tests\Integration\Migrations\NonExistingMigration', ], $analyser->getUnfulfillable()); } } diff --git a/app/sprinkles/core/tests/Integration/MigrationLocatorTest.php b/app/sprinkles/core/tests/Integration/Database/Migrator/MigrationLocatorTest.php similarity index 95% rename from app/sprinkles/core/tests/Integration/MigrationLocatorTest.php rename to app/sprinkles/core/tests/Integration/Database/Migrator/MigrationLocatorTest.php index 1ccab2b06..a5c0fbdcb 100644 --- a/app/sprinkles/core/tests/Integration/MigrationLocatorTest.php +++ b/app/sprinkles/core/tests/Integration/Database/Migrator/MigrationLocatorTest.php @@ -1,5 +1,6 @@ assertCount(8, $results); $this->assertEquals($expected, $results); return $locator; diff --git a/app/sprinkles/core/tests/Integration/MigrationRepositoryTest.php b/app/sprinkles/core/tests/Integration/Database/Migrator/MigrationRepositoryTest.php similarity index 97% rename from app/sprinkles/core/tests/Integration/MigrationRepositoryTest.php rename to app/sprinkles/core/tests/Integration/Database/Migrator/MigrationRepositoryTest.php index a16a95cbc..b1659417b 100644 --- a/app/sprinkles/core/tests/Integration/MigrationRepositoryTest.php +++ b/app/sprinkles/core/tests/Integration/Database/Migrator/MigrationRepositoryTest.php @@ -1,5 +1,6 @@ setupTestDatabase(); - } - - public function testMigratorService() - { - $this->assertInstanceOf('UserFrosting\Sprinkle\Core\Database\Migrator\Migrator', $this->ci->migrator); - } -} diff --git a/app/sprinkles/core/tests/Integration/Error/Handler/ExceptionHandlerTest.php b/app/sprinkles/core/tests/Integration/Error/Handler/ExceptionHandlerTest.php index 4d9ca9df5..bae015452 100644 --- a/app/sprinkles/core/tests/Integration/Error/Handler/ExceptionHandlerTest.php +++ b/app/sprinkles/core/tests/Integration/Error/Handler/ExceptionHandlerTest.php @@ -1,5 +1,6 @@ assertTrue($files->delete('file.txt')); - $this->assertFileNotExists($this->testDir.'/file.txt'); + $this->assertFileNotExists($this->testDir . '/file.txt'); } /** @@ -116,7 +117,7 @@ public function testUrl(FilesystemAdapter $files) $url = $files->url('file.txt'); $this->assertEquals('files/testing/file.txt', $url); $this->assertTrue($files->delete('file.txt')); - $this->assertFileNotExists($this->testDir.'/file.txt'); + $this->assertFileNotExists($this->testDir . '/file.txt'); } /** diff --git a/app/sprinkles/core/tests/Integration/Migrations/DeprecatedClassTable.php b/app/sprinkles/core/tests/Integration/Migrations/DeprecatedClassTable.php index 4aee13c71..19055ed5f 100644 --- a/app/sprinkles/core/tests/Integration/Migrations/DeprecatedClassTable.php +++ b/app/sprinkles/core/tests/Integration/Migrations/DeprecatedClassTable.php @@ -1,5 +1,6 @@ 'Seed1', 'class' => '\\UserFrosting\\Sprinkle\\Core\\Database\\Seeds\\Seed1', - 'sprinkle' => 'Core' + 'sprinkle' => 'Core', ], [ 'name' => 'Seed2', 'class' => '\\UserFrosting\\Sprinkle\\Core\\Database\\Seeds\\Seed2', - 'sprinkle' => 'Core' + 'sprinkle' => 'Core', ], [ 'name' => 'Test/Seed', 'class' => '\\UserFrosting\\Sprinkle\\Core\\Database\\Seeds\\Test\\Seed', - 'sprinkle' => 'Core' - ] + 'sprinkle' => 'Core', + ], ], $seeds); } @@ -96,7 +97,7 @@ public function testGetSeed(Seeder $seeder) $this->assertEquals([ 'name' => 'Seed1', 'class' => '\\UserFrosting\\Sprinkle\\Core\\Database\\Seeds\\Seed1', - 'sprinkle' => 'Core' + 'sprinkle' => 'Core', ], $seed); } diff --git a/app/sprinkles/core/tests/Integration/Seeder/Seeds/Seed1.php b/app/sprinkles/core/tests/Integration/Seeder/Seeds/Seed1.php index d6923599e..b61ee6eff 100644 --- a/app/sprinkles/core/tests/Integration/Seeder/Seeds/Seed1.php +++ b/app/sprinkles/core/tests/Integration/Seeder/Seeds/Seed1.php @@ -1,5 +1,6 @@ ci->config['alert.storage'] = 'cache'; + $this->assertInstanceOf(CacheAlertStream::class, $this->ci->alerts); + } + + public function testSessionConfig() + { + $this->ci->config['alert.storage'] = 'session'; + $this->assertInstanceOf(SessionAlertStream::class, $this->ci->alerts); + } + + public function testBadConfig() + { + $this->ci->config['alert.storage'] = 'foo'; + $this->expectException(\Exception::class); + $alerts = $this->ci->alerts; + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/AssetLoaderServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/AssetLoaderServiceTest.php new file mode 100644 index 000000000..d02d57a02 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/AssetLoaderServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(AssetLoader::class, $this->ci->assetLoader); + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/AssetsServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/AssetsServiceTest.php new file mode 100644 index 000000000..6f73b71cb --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/AssetsServiceTest.php @@ -0,0 +1,56 @@ +ci->config['assets.use_raw'] = true; + $this->assertInstanceOf(Assets::class, $this->ci->assets); + } + + // We don't know if assets are compiled or not during testing, so if + // `bundle.result.json` is available or not, this might fails + // This will need to be completed once we can mock a service in integration tests + /*public function testServiceWithCompiledAssets() + { + $this->ci->config['assets.use_raw'] = false; + + // Overwrite the locator to return our test `bundle.result.json` so we're sure it exist + // @TODO + + $this->assertInstanceOf(Assets::class, $this->ci->assets); + }*/ + + /* + public function testServiceWithCompiledAssetsAndNoBundleShema() + { + $this->ci->config['assets.use_raw'] = false; + + // Overwrite the locator to return a non-existing `bundle.result.json` + // @TODO + + // Should throw a FileNotFoundException or JsonException + $this->expectedException(\Exception::class); + $assets = $this->ci->assets; + }*/ +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/CacheServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/CacheServiceTest.php new file mode 100644 index 000000000..8d699df67 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/CacheServiceTest.php @@ -0,0 +1,52 @@ +ci->config['cache.driver'] = 'file'; + $this->assertInstanceOf(Cache::class, $this->ci->cache); + } + + /** + * @requires extension Memcached + */ + public function testMemcachedConfig() + { + $this->ci->config['cache.driver'] = 'memcached'; + $this->assertInstanceOf(Cache::class, $this->ci->cache); + } + + /** + * @requires extension redis + */ + public function testRedisConfig() + { + $this->ci->config['cache.driver'] = 'redis'; + $this->assertInstanceOf(Cache::class, $this->ci->cache); + } + + public function testBadConfig() + { + $this->ci->config['cache.driver'] = 'foo'; + $this->expectException(\Exception::class); + $cache = $this->ci->cache; + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/CheckEnvironmentServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/CheckEnvironmentServiceTest.php new file mode 100644 index 000000000..c74e2132f --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/CheckEnvironmentServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(CheckEnvironment::class, $this->ci->checkEnvironment); + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/ClassMapperServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/ClassMapperServiceTest.php new file mode 100644 index 000000000..6a9badbaf --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/ClassMapperServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(ClassMapper::class, $this->ci->classMapper); + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/ConfigServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/ConfigServiceTest.php new file mode 100644 index 000000000..abd8047e7 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/ConfigServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(Config::class, $this->ci->config); + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/DbServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/DbServiceTest.php new file mode 100644 index 000000000..e30c45d1c --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/DbServiceTest.php @@ -0,0 +1,32 @@ +assertInstanceOf(Manager::class, $this->ci->db); + } + + public function testServiceWithDebug() + { + $this->ci->config['debug.queries'] = true; + $this->assertInstanceOf(Manager::class, $this->ci->db); + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/DebugLoggerServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/DebugLoggerServiceTest.php new file mode 100644 index 000000000..d8a670523 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/DebugLoggerServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(Logger::class, $this->ci->debugLogger); + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/ErrorHandlerServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/ErrorHandlerServiceTest.php new file mode 100644 index 000000000..daac9b3ae --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/ErrorHandlerServiceTest.php @@ -0,0 +1,34 @@ +assertInstanceOf(ExceptionHandlerManager::class, $this->ci->errorHandler); + } + + /** + * @depends testService + */ + public function testphpErrorHandlerService() + { + $this->assertInstanceOf(ExceptionHandlerManager::class, $this->ci->phpErrorHandler); + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/ErrorLoggerServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/ErrorLoggerServiceTest.php new file mode 100644 index 000000000..604c65569 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/ErrorLoggerServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(Logger::class, $this->ci->errorLogger); + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/FactoryServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/FactoryServiceTest.php new file mode 100644 index 000000000..ee7a12841 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/FactoryServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(FactoryMuffin::class, $this->ci->factory); + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/LocalePathBuilderServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/LocalePathBuilderServiceTest.php new file mode 100644 index 000000000..727a31e44 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/LocalePathBuilderServiceTest.php @@ -0,0 +1,42 @@ +assertInstanceOf(LocalePathBuilder::class, $this->ci->localePathBuilder); + } + + public function testServiceWithUnexpectedValueExceptionOnNonStringConfig() + { + $this->ci->config['site.locales.default'] = []; + $this->expectException(\UnexpectedValueException::class); + $this->ci->localePathBuilder; + } + + public function testServiceWithUnexpectedValueExceptionOnEmptyStringConfig() + { + $this->ci->config['site.locales.default'] = ''; + $this->expectException(\UnexpectedValueException::class); + $this->ci->localePathBuilder; + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/MailerServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/MailerServiceTest.php new file mode 100644 index 000000000..26d768b41 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/MailerServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(Mailer::class, $this->ci->mailer); + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/QueryLoggerServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/QueryLoggerServiceTest.php new file mode 100644 index 000000000..1a3738892 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/QueryLoggerServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(Logger::class, $this->ci->queryLogger); + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/RouterServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/RouterServiceTest.php new file mode 100644 index 000000000..3d8de8c74 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/RouterServiceTest.php @@ -0,0 +1,44 @@ +assertInstanceOf(Router::class, $this->ci->router); + } + + /** + * @depends testService + * Test router integration in Tests + */ + public function testBasicTest() + { + /** @var \UserFrosting\Sprinkle\Core\Router $router */ + $router = $this->ci->router; + + // Get all routes. We should have more than 0 in a default install + $routes = $router->getRoutes(); + $this->assertNotCount(0, $routes); + + // Try to get a path + $path = $router->pathFor('index'); + $this->assertEquals('/', $path); + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/ThrottlerServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/ThrottlerServiceTest.php new file mode 100644 index 000000000..50cbfe564 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/ThrottlerServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(Throttler::class, $this->ci->throttler); + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/TranslatorServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/TranslatorServiceTest.php new file mode 100644 index 000000000..8296f6183 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/TranslatorServiceTest.php @@ -0,0 +1,26 @@ +assertInstanceOf(MessageTranslator::class, $this->ci->translator); + } +} diff --git a/app/sprinkles/core/tests/Integration/ServicesProvider/ViewServiceTest.php b/app/sprinkles/core/tests/Integration/ServicesProvider/ViewServiceTest.php new file mode 100644 index 000000000..15ccfce4b --- /dev/null +++ b/app/sprinkles/core/tests/Integration/ServicesProvider/ViewServiceTest.php @@ -0,0 +1,44 @@ +assertInstanceOf(Twig::class, $this->ci->view); + } + + /** + * @depends testService + */ + public function testServiceWithCache() + { + $this->ci->config['cache.twig'] = true; + $this->assertInstanceOf(Twig::class, $this->ci->view); + } + + /** + * @depends testService + */ + public function testServiceWithDebug() + { + $this->ci->config['debug.twig'] = true; + $this->assertInstanceOf(Twig::class, $this->ci->view); + } +} diff --git a/app/sprinkles/core/tests/Integration/Session/SessionDatabaseHandlerTest.php b/app/sprinkles/core/tests/Integration/Session/SessionDatabaseHandlerTest.php new file mode 100644 index 000000000..0fd47fb93 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/Session/SessionDatabaseHandlerTest.php @@ -0,0 +1,165 @@ +setupTestDatabase(); + $this->refreshDatabase(); + } + + /** + * Test session table connection & existance + */ + public function testSessionTable() + { + $connection = $this->ci->db->connection(); + $config = $this->ci->config; + $table = $config['session.database.table']; + + // Check connexion is ok and returns what's expected from DatabaseSessionHandler + $this->assertInstanceOf(\Illuminate\Database\ConnectionInterface::class, $connection); + $this->assertInstanceOf(\Illuminate\Database\Query\Builder::class, $connection->table($table)); + + // Check table exist + $this->assertTrue($connection->getSchemaBuilder()->hasTable($table)); + } + + /** + * @depends testSessionTable + */ + public function testSessionWrite() + { + $config = $this->ci->config; + $connection = $this->ci->db->connection(); + + // Define random session ID + $session_id = 'test' . rand(1, 100000); + + // Make sure db is empty at first + $this->assertEquals(0, SessionTable::count()); + $this->assertNull(SessionTable::find($session_id)); + + // Get handler + $handler = new DatabaseSessionHandler($connection, $config['session.database.table'], $config['session.minutes']); + + // Write session + // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/DatabaseSessionHandler.php#L132 + $this->assertTrue($handler->write($session_id, 'foo')); + + // Closing the handler does nothing anyway + // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/DatabaseSessionHandler.php#L78 + $this->assertTrue($handler->close()); + + // Read session + // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/DatabaseSessionHandler.php#L86-L101 + $this->assertSame('foo', $handler->read($session_id)); + + // Check manually that the file has been written + $this->assertNotEquals(0, SessionTable::count()); + $this->assertNotNull(SessionTable::find($session_id)); + $this->assertSame(base64_encode('foo'), SessionTable::find($session_id)->payload); + + // Destroy session + // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/DatabaseSessionHandler.php#L256 + $this->assertTrue($handler->destroy($session_id)); + + // Check db to make sure it's gone + $this->assertEquals(0, SessionTable::count()); + $this->assertNull(SessionTable::find($session_id)); + } + + /** + * Simulate session service with database handler. + * We can't use the real service as it is created before we can even setup + * the in-memory database with the basic table we need + * + * @depends testSessionWrite + */ + public function testUsingSessionDouble() + { + $this->ci->session->destroy(); + + $config = $this->ci->config; + $connection = $this->ci->db->connection(); + $handler = new DatabaseSessionHandler($connection, $config['session.database.table'], $config['session.minutes']); + $session = new Session($handler, $config['session']); + + $this->assertInstanceOf(Session::class, $session); + $this->assertInstanceOf(DatabaseSessionHandler::class, $session->getHandler()); + $this->assertSame($handler, $session->getHandler()); + + $this->sessionTests($session); + } + + /** + * @depends testUsingSessionDouble + */ + public function testUsingSessionService() + { + // Reset CI Session + $this->useDatabaseSessionHandler(); + + // Make sure config is set + $this->sessionTests($this->ci->session); + } + + /** + * @param Session $session + */ + protected function sessionTests(Session $session) + { + // Make sure session service have correct instance + $this->assertInstanceOf(Session::class, $session); + $this->assertInstanceOf(DatabaseSessionHandler::class, $session->getHandler()); + + // Destroy previously defined session + $session->destroy(); + + // Start new one and validate status + $this->assertSame(PHP_SESSION_NONE, $session->status()); + $session->start(); + $this->assertSame(PHP_SESSION_ACTIVE, $session->status()); + + // Get id + $session_id = $session->getId(); + + // Set something to the session + $session->set('foo', 'bar'); + $this->assertEquals('bar', $session->get('foo')); + + // Close session to initiate write + session_write_close(); + + // Make sure db was filled with something + $this->assertNotEquals(0, SessionTable::count()); + $this->assertNotNull(SessionTable::find($session_id)); + } +} diff --git a/app/sprinkles/core/tests/Integration/Session/SessionFileHandlerTest.php b/app/sprinkles/core/tests/Integration/Session/SessionFileHandlerTest.php new file mode 100644 index 000000000..cd6575a38 --- /dev/null +++ b/app/sprinkles/core/tests/Integration/Session/SessionFileHandlerTest.php @@ -0,0 +1,161 @@ +ci->locator->findResource('session://'); + + // Define session filename + $session_file = "$session_dir/$session_id"; + + // Delete existing file to prevent false positive + $fs->delete($session_file); + $this->assertFalse($fs->exists($session_file)); + + // Get handler + $handler = new FileSessionHandler($fs, $session_dir, 120); + + // Write session + // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/FileSessionHandler.php#L83 + // write() ==> $this->files->put($this->path.'/'.$sessionId, $data, true); + $this->assertTrue($handler->write($session_id, 'foo')); + + // Closing the handler does nothing anyway + // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/FileSessionHandler.php#L61 + // close() ==> return true; + $this->assertTrue($handler->close()); + + // Read session + // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/FileSessionHandler.php#L71 + // read() ==> return $this->files->get($path, true); + $this->assertSame('foo', $handler->read($session_id)); + + // Check manually that the file has been written + $this->assertTrue($fs->exists($session_file)); + $this->assertSame('foo', $fs->get($session_file)); + + // Destroy session + // https://github.com/laravel/framework/blob/5.8/src/Illuminate/Session/FileSessionHandler.php#L93 + // destroy() ==> $this->files->delete($this->path.'/'.$sessionId); + $this->assertTrue($handler->destroy($session_id)); + + // Check filesystem to make sure it's gone + $this->assertFalse($fs->exists($session_file)); + } + + /** + * @depends testSessionWrite + */ + public function testUsingSessionDouble() + { + $this->ci->session->destroy(); + $this->sessionTests($this->getSession()); + } + + /** + * @depends testUsingSessionDouble + */ + public function testUsingSessionService() + { + // Force test to use database session handler + putenv('TEST_SESSION_HANDLER=file'); + + // Refresh app to use new setup + $this->ci->session->destroy(); + $this->refreshApplication(); + + // Check setting is ok + $this->assertSame('file', $this->ci->config['session.handler']); + + // Make sure config is set + $this->sessionTests($this->ci->session); + + // Unset the env when test is done to avoid conflict + putenv('TEST_SESSION_HANDLER'); + } + + /** + * Simulate session service with database handler. + * We can't use the real service as it is created before we can even setup + * the in-memory database with the basic table we need + * + * @return Session + */ + protected function getSession() + { + $config = $this->ci->config; + $fs = new Filesystem(); + $handler = new FileSessionHandler($fs, $this->ci->locator->findResource('session://'), 120); + $session = new Session($handler, $config['session']); + + $this->assertInstanceOf(Session::class, $session); + $this->assertInstanceOf(FileSessionHandler::class, $session->getHandler()); + $this->assertSame($handler, $session->getHandler()); + + return $session; + } + + /** + * @param Session $session + */ + protected function sessionTests(Session $session) + { + // Make sure session service have correct instance + $this->assertInstanceOf(Session::class, $session); + $this->assertInstanceOf(FileSessionHandler::class, $session->getHandler()); + + // Destroy previously defined session + $session->destroy(); + + // Start new one and validate status + $this->assertSame(PHP_SESSION_NONE, $session->status()); + $session->start(); + $this->assertSame(PHP_SESSION_ACTIVE, $session->status()); + + // Get id + $session_id = $session->getId(); + + // Set something to the session + $session->set('foo', 'bar'); + $this->assertEquals('bar', $session->get('foo')); + + // Close session to initiate write + session_write_close(); + + // Make sure file was filled with something + $session_dir = $this->ci->locator->findResource('session://'); + $session_file = "$session_dir/$session_id"; + + $fs = new Filesystem(); + $this->assertTrue($fs->exists($session_file)); + $this->assertSame('foo|s:3:"bar";', $fs->get($session_file)); + } +} diff --git a/app/sprinkles/core/tests/Unit/TestDatabaseTraitTest.php b/app/sprinkles/core/tests/Integration/TestDatabaseTraitTest.php similarity index 94% rename from app/sprinkles/core/tests/Unit/TestDatabaseTraitTest.php rename to app/sprinkles/core/tests/Integration/TestDatabaseTraitTest.php index 0b6f69fbe..85903b329 100644 --- a/app/sprinkles/core/tests/Unit/TestDatabaseTraitTest.php +++ b/app/sprinkles/core/tests/Integration/TestDatabaseTraitTest.php @@ -1,5 +1,6 @@ ci->db->getConnection(); diff --git a/app/sprinkles/core/tests/TestDatabase.php b/app/sprinkles/core/tests/TestDatabase.php index 0029f519a..394ddd66d 100644 --- a/app/sprinkles/core/tests/TestDatabase.php +++ b/app/sprinkles/core/tests/TestDatabase.php @@ -1,5 +1,6 @@ key, $translator, $cache, $this->session_id); + + $this->assertInstanceOf(AlertStream::class, $stream); + $this->assertInstanceOf(CacheAlertStream::class, $stream); + } + + /** + * @depends testConstructor + */ + public function testSetTranslator() + { + $translator = m::mock(MessageTranslator::class); + $cache = m::mock(Cache::class); + $stream = new CacheAlertStream($this->key, $translator, $cache, $this->session_id); + + $this->assertSame($translator, $stream->translator()); + + $translator2 = m::mock(MessageTranslator::class); + $this->assertNotSame($translator, $translator2); + $this->assertInstanceOf(CacheAlertStream::class, $stream->setTranslator($translator2)); + $this->assertSame($translator2, $stream->translator()); + } + + /** + * @depends testConstructor + */ + public function testAddMessage() + { + // Build Mock + $translator = m::mock(MessageTranslator::class); + $cache = m::mock(Cache::class); + $tags = m::mock(\Illuminate\Cache\TaggedCache::class); + + // Set expectations + $message = [ + 'type' => 'success', + 'message' => 'foo', + ]; + $tags->shouldReceive('has')->with($this->key)->once()->andReturn(false); + $tags->shouldReceive('forever')->with($this->key, [$message])->once()->andReturn(null); + $cache->shouldReceive('tags')->with('_s' . $this->session_id)->andReturn($tags); + + // Process + $stream = new CacheAlertStream($this->key, $translator, $cache, $this->session_id); + $this->assertInstanceOf(CacheAlertStream::class, $stream->addMessage('success', 'foo')); + } + + /** + * @depends testAddMessage + */ + public function testAddMessageWithExistingkey() + { + // Build Mock + $translator = m::mock(MessageTranslator::class); + $cache = m::mock(Cache::class); + $tags = m::mock(\Illuminate\Cache\TaggedCache::class); + + // Set expectations + $message = [ + 'type' => 'success', + 'message' => 'foo', + ]; + $tags->shouldReceive('has')->with($this->key)->once()->andReturn(true); + $tags->shouldReceive('get')->with($this->key)->once()->andReturn(false); + $tags->shouldReceive('forever')->with($this->key, [$message])->once()->andReturn(null); + $cache->shouldReceive('tags')->with('_s' . $this->session_id)->andReturn($tags); + + // Process + $stream = new CacheAlertStream($this->key, $translator, $cache, $this->session_id); + $this->assertInstanceOf(CacheAlertStream::class, $stream->addMessage('success', 'foo')); + } + + /** + * @depends testAddMessageWithExistingkey + */ + public function testAddMessageWithExistingkeyNotEmpty() + { + // Build Mock + $translator = m::mock(MessageTranslator::class); + $cache = m::mock(Cache::class); + $tags = m::mock(\Illuminate\Cache\TaggedCache::class); + + // Set expectations + $message = [ + 'type' => 'success', + 'message' => 'foo', + ]; + $tags->shouldReceive('has')->with($this->key)->once()->andReturn(true); + $tags->shouldReceive('get')->with($this->key)->once()->andReturn([$message]); + $tags->shouldReceive('forever')->with($this->key, [$message, $message])->once()->andReturn(null); + $cache->shouldReceive('tags')->with('_s' . $this->session_id)->andReturn($tags); + + // Process + $stream = new CacheAlertStream($this->key, $translator, $cache, $this->session_id); + $this->assertInstanceOf(CacheAlertStream::class, $stream->addMessage('success', 'foo')); + } + + /** + * @depends testConstructor + */ + public function testResetMessageStream() + { + // Build Mock + $translator = m::mock(MessageTranslator::class); + $cache = m::mock(Cache::class); + $tags = m::mock(\Illuminate\Cache\TaggedCache::class); + + // Set expectations + $tags->shouldReceive('forget')->with($this->key)->once()->andReturn(true); + $cache->shouldReceive('tags')->with('_s' . $this->session_id)->andReturn($tags); + + // Process + $stream = new CacheAlertStream($this->key, $translator, $cache, $this->session_id); + $this->assertNull($stream->resetMessageStream()); + } + + /** + * @depends testConstructor + */ + public function testAddMessageTranslatedWithNoTranslator() + { + $cache = m::mock(Cache::class); + $stream = new CacheAlertStream($this->key, null, $cache, $this->session_id); + + $this->expectException(\RuntimeException::class); + $stream->addMessageTranslated('success', 'foo', []); + } + + /** + * @depends testConstructor + */ + public function testAddMessageTranslated() + { + // Build Mock + $translator = m::mock(MessageTranslator::class); + $cache = m::mock(Cache::class); + $tags = m::mock(\Illuminate\Cache\TaggedCache::class); + + // + $key = 'FOO'; + $placeholder = ['key' => 'value']; + $result = 'Bar'; + + // Set expectations + $translator->shouldReceive('translate')->with($key, $placeholder)->andReturn($result); + $message = [ + 'type' => 'success', + 'message' => $result, + ]; + $tags->shouldReceive('has')->with($this->key)->once()->andReturn(false); + $tags->shouldReceive('forever')->with($this->key, [$message])->once()->andReturn(null); + $cache->shouldReceive('tags')->with('_s' . $this->session_id)->andReturn($tags); + + // Process + $stream = new CacheAlertStream($this->key, $translator, $cache, $this->session_id); + $this->assertInstanceOf(CacheAlertStream::class, $stream->addMessageTranslated('success', $key, $placeholder)); + } + + /** + * @depends testAddMessageWithExistingkey + * @depends testResetMessageStream + */ + public function testGetAndClearMessages() + { + // Build Mock + $translator = m::mock(MessageTranslator::class); + $cache = m::mock(Cache::class); + $tags = m::mock(\Illuminate\Cache\TaggedCache::class); + + // Set expectations + $message = [ + 'type' => 'success', + 'message' => 'foo', + ]; + $tags->shouldReceive('forget')->with($this->key)->once()->andReturn(true); + $tags->shouldReceive('has')->with($this->key)->once()->andReturn(true); + $tags->shouldReceive('get')->with($this->key)->once()->andReturn([$message]); + $cache->shouldReceive('tags')->with('_s' . $this->session_id)->andReturn($tags); + + // Process + $stream = new CacheAlertStream($this->key, $translator, $cache, $this->session_id); + $this->assertSame([$message], $stream->getAndClearMessages()); + } + + /** + * @depends testAddMessage + */ + public function testAddValidationErrors() + { + // Build Mock + $translator = m::mock(MessageTranslator::class); + $cache = m::mock(Cache::class); + $tags = m::mock(\Illuminate\Cache\TaggedCache::class); + $validator = m::mock(\UserFrosting\Fortress\ServerSideValidator::class); + + // Set expectations + $data = [ + 'name' => ['Name is required'], + 'email' => ['Email should be a valid email address'], + ]; + $validator->shouldReceive('errors')->once()->andReturn($data); + + $message1 = [ + 'type' => 'danger', + 'message' => 'Name is required', + ]; + $message2 = [ + 'type' => 'danger', + 'message' => 'Email should be a valid email address', + ]; + $tags->shouldReceive('has')->with($this->key)->andReturn(false, [$message1], [$message1, $message2]); // Save 1, Save 2, display both + $tags->shouldReceive('get')->with($this->key)->andReturn([$message1], [$message1, $message2]); // Save 2, Display both + $tags->shouldReceive('forever')->with($this->key, [$message1])->once()->andReturn(null); // Save 1 + $tags->shouldReceive('forever')->with($this->key, [$message1, $message2])->once()->andReturn(null); // Save 2 + $cache->shouldReceive('tags')->with('_s' . $this->session_id)->andReturn($tags); + + // Process + $stream = new CacheAlertStream($this->key, $translator, $cache, $this->session_id); + $stream->addValidationErrors($validator); + $this->assertSame([$message1, $message2], $stream->messages()); + } +} diff --git a/app/sprinkles/core/tests/Unit/Alert/SessionAlertStreamTest.php b/app/sprinkles/core/tests/Unit/Alert/SessionAlertStreamTest.php new file mode 100644 index 000000000..e8dc2de21 --- /dev/null +++ b/app/sprinkles/core/tests/Unit/Alert/SessionAlertStreamTest.php @@ -0,0 +1,217 @@ +key, $translator, $session); + + $this->assertInstanceOf(AlertStream::class, $stream); + $this->assertInstanceOf(SessionAlertStream::class, $stream); + } + + /** + * @depends testConstructor + */ + public function testSetTranslator() + { + $translator = m::mock(MessageTranslator::class); + $session = m::mock(Session::class); + $stream = new SessionAlertStream($this->key, $translator, $session); + + $this->assertSame($translator, $stream->translator()); + + $translator2 = m::mock(MessageTranslator::class); + $this->assertNotSame($translator, $translator2); + $this->assertInstanceOf(SessionAlertStream::class, $stream->setTranslator($translator2)); + $this->assertSame($translator2, $stream->translator()); + } + + /** + * @depends testConstructor + */ + public function testAddMessage() + { + // Build Mock + $translator = m::mock(MessageTranslator::class); + $session = m::mock(Session::class); + + // Set expectations + $message = [ + 'type' => 'success', + 'message' => 'foo', + ]; + $session->shouldReceive('get')->with($this->key)->once()->andReturn(false); + $session->shouldReceive('set')->with($this->key, [$message])->once()->andReturn(null); + + // Process + $stream = new SessionAlertStream($this->key, $translator, $session); + $this->assertInstanceOf(SessionAlertStream::class, $stream->addMessage('success', 'foo')); + } + + /** + * @depends testAddMessage + */ + public function testAddMessageWithExistingkeyNotEmpty() + { + // Build Mock + $translator = m::mock(MessageTranslator::class); + $session = m::mock(Session::class); + + // Set expectations + $message = [ + 'type' => 'success', + 'message' => 'foo', + ]; + $session->shouldReceive('get')->with($this->key)->once()->andReturn([$message]); + $session->shouldReceive('set')->with($this->key, [$message, $message])->once()->andReturn(null); + + // Process + $stream = new SessionAlertStream($this->key, $translator, $session); + $this->assertInstanceOf(SessionAlertStream::class, $stream->addMessage('success', 'foo')); + } + + /** + * @depends testConstructor + */ + public function testResetMessageStream() + { + // Build Mock + $translator = m::mock(MessageTranslator::class); + $session = m::mock(Session::class); + + // Set expectations + $session->shouldReceive('set')->with($this->key, [])->once()->andReturn(true); + + // Process + $stream = new SessionAlertStream($this->key, $translator, $session); + $this->assertNull($stream->resetMessageStream()); + } + + /** + * @depends testConstructor + */ + public function testAddMessageTranslatedWithNoTranslator() + { + $session = m::mock(Session::class); + $stream = new SessionAlertStream($this->key, null, $session); + + $this->expectException(\RuntimeException::class); + $stream->addMessageTranslated('success', 'foo', []); + } + + /** + * @depends testConstructor + */ + public function testAddMessageTranslated() + { + // Build Mock + $translator = m::mock(MessageTranslator::class); + $session = m::mock(Session::class); + + // + $key = 'FOO'; + $placeholder = ['key' => 'value']; + $result = 'Bar'; + + // Set expectations + $translator->shouldReceive('translate')->with($key, $placeholder)->andReturn($result); + $message = [ + 'type' => 'success', + 'message' => $result, + ]; + $session->shouldReceive('get')->with($this->key)->once()->andReturn(false); + $session->shouldReceive('set')->with($this->key, [$message])->once()->andReturn(null); + + // Process + $stream = new SessionAlertStream($this->key, $translator, $session); + $this->assertInstanceOf(SessionAlertStream::class, $stream->addMessageTranslated('success', $key, $placeholder)); + } + + /** + * @depends testResetMessageStream + */ + public function testGetAndClearMessages() + { + // Build Mock + $translator = m::mock(MessageTranslator::class); + $session = m::mock(Session::class); + + // Set expectations + $message = [ + 'type' => 'success', + 'message' => 'foo', + ]; + $session->shouldReceive('get')->with($this->key)->once()->andReturn([$message]); + $session->shouldReceive('set')->with($this->key, [])->once()->andReturn(true); + + // Process + $stream = new SessionAlertStream($this->key, $translator, $session); + $this->assertSame([$message], $stream->getAndClearMessages()); + } + + /** + * @depends testAddMessage + */ + public function testAddValidationErrors() + { + // Build Mock + $translator = m::mock(MessageTranslator::class); + $session = m::mock(Session::class); + $validator = m::mock(\UserFrosting\Fortress\ServerSideValidator::class); + + // Set expectations + $data = [ + 'name' => ['Name is required'], + 'email' => ['Email should be a valid email address'], + ]; + $validator->shouldReceive('errors')->once()->andReturn($data); + + $message1 = [ + 'type' => 'danger', + 'message' => 'Name is required', + ]; + $message2 = [ + 'type' => 'danger', + 'message' => 'Email should be a valid email address', + ]; + $session->shouldReceive('get')->with($this->key)->andReturn(false, [$message1], [$message1, $message2]); // Save 1, Save 2, Display both + $session->shouldReceive('set')->with($this->key, [$message1])->andReturn(null); // Save 1 + $session->shouldReceive('set')->with($this->key, [$message1, $message2])->andReturn(null); // Save 2 + + // Process + $stream = new SessionAlertStream($this->key, $translator, $session); + $stream->addValidationErrors($validator); + $this->assertSame([$message1, $message2], $stream->messages()); + } +} diff --git a/app/sprinkles/core/tests/Unit/BelongsToManyThroughTest.php b/app/sprinkles/core/tests/Unit/Database/Relations/BelongsToManyThroughTest.php similarity index 95% rename from app/sprinkles/core/tests/Unit/BelongsToManyThroughTest.php rename to app/sprinkles/core/tests/Unit/Database/Relations/BelongsToManyThroughTest.php index 22e2ad203..a343fd435 100644 --- a/app/sprinkles/core/tests/Unit/BelongsToManyThroughTest.php +++ b/app/sprinkles/core/tests/Unit/Database/Relations/BelongsToManyThroughTest.php @@ -1,5 +1,6 @@ permission BelongsToMany relation $intermediateRelationship = m::mock(BelongsToMany::class); $intermediateRelationship->shouldReceive('getTable')->once()->andReturn('permission_roles'); - $intermediateRelationship->shouldReceive('getQualifiedRelatedKeyName')->once()->andReturn('permission_roles.role_id'); + $intermediateRelationship->shouldReceive('getQualifiedRelatedPivotKeyName')->once()->andReturn('permission_roles.role_id'); // Crazy pivot query stuff $newPivot = m::mock('\Illuminate\Database\Eloquent\Relations\Pivot'); $newPivot->shouldReceive('getForeignKey')->andReturn('permission_id'); @@ -96,7 +97,8 @@ protected function getRelation() 'role_users', 'role_id', 'user_id', - 'relation_name' + 'relation_name', + 'id' ); } } diff --git a/app/sprinkles/core/tests/Unit/DatabaseSyncableTest.php b/app/sprinkles/core/tests/Unit/Database/Relations/DatabaseSyncableTest.php similarity index 94% rename from app/sprinkles/core/tests/Unit/DatabaseSyncableTest.php rename to app/sprinkles/core/tests/Unit/Database/Relations/DatabaseSyncableTest.php index cf363f876..61e8ec2db 100644 --- a/app/sprinkles/core/tests/Unit/DatabaseSyncableTest.php +++ b/app/sprinkles/core/tests/Unit/Database/Relations/DatabaseSyncableTest.php @@ -1,5 +1,6 @@ expectCreatedModel($relation, [ - 'id' => 'x' + 'id' => 'x', ]); $model->shouldReceive('getAttribute')->with('id')->andReturn('x'); @@ -89,17 +92,17 @@ public function syncMethodHasManyListProvider() [ [ 'id' => 2, - 'species' => 'Tyto' + 'species' => 'Tyto', ], [ 'id' => 3, - 'species' => 'Megascops' + 'species' => 'Megascops', ], [ - 'id' => 'x' - ] - ] - ] + 'id' => 'x', + ], + ], + ], // Additional test sets here ]; } diff --git a/app/sprinkles/core/tests/Unit/SprunjeTest.php b/app/sprinkles/core/tests/Unit/Sprunje/SprunjeTest.php similarity index 91% rename from app/sprinkles/core/tests/Unit/SprunjeTest.php rename to app/sprinkles/core/tests/Unit/Sprunje/SprunjeTest.php index 7346f1eee..c5501ea72 100644 --- a/app/sprinkles/core/tests/Unit/SprunjeTest.php +++ b/app/sprinkles/core/tests/Unit/Sprunje/SprunjeTest.php @@ -1,5 +1,6 @@ [ - 'species' => 'Tyto' - ] + 'species' => 'Tyto', + ], ]); $builder = $sprunje->getQuery(); @@ -54,8 +55,8 @@ public function testSprunjeApplySortsDefault() { $sprunje = new SprunjeStub([ 'sorts' => [ - 'species' => 'asc' - ] + 'species' => 'asc', + ], ]); $builder = $sprunje->getQuery(); @@ -67,11 +68,11 @@ public function testSprunjeApplySortsDefault() class SprunjeStub extends Sprunje { protected $filterable = [ - 'species' + 'species', ]; protected $sortable = [ - 'species' + 'species', ]; public function __construct($options) diff --git a/app/sprinkles/core/tests/withController.php b/app/sprinkles/core/tests/withController.php new file mode 100644 index 000000000..aafdd0c49 --- /dev/null +++ b/app/sprinkles/core/tests/withController.php @@ -0,0 +1,42 @@ +usingInMemoryDatabase()) { + $this->markTestSkipped("Can't run this test on memory database"); + } + + // Force test to use database session handler + putenv('TEST_SESSION_HANDLER=database'); + + // Unset the env when test is done to avoid conflict + $this->beforeApplicationDestroyedCallbacks[] = function () { + putenv('TEST_SESSION_HANDLER'); + }; + + // Refresh app to use new setup + $this->ci->session->destroy(); + $this->refreshApplication(); + $this->setupTestDatabase(); //<-- N.B.: This is executed after the session is created on the default db... + $this->refreshDatabase(); + + // Make sure it worked + if (!($this->ci->session->getHandler() instanceof DatabaseSessionHandler)) { + $this->markTestSkipped('Session handler not an instance of DatabaseSessionHandler'); + } + } +} diff --git a/app/system/Bakery/Bakery.php b/app/system/Bakery/Bakery.php index 68d5dda1f..1d8fe1a48 100644 --- a/app/system/Bakery/Bakery.php +++ b/app/system/Bakery/Bakery.php @@ -1,5 +1,6 @@ ci->locator; @@ -117,10 +118,11 @@ protected function loadCommands() } /** - * Transform a Bakery Command Resource into a classpath + * Transform a Bakery Command Resource into a classpath. * - * @param \UserFrosting\UniformResourceLocator\Resource $file The command resource - * @return string The command class path + * @param \UserFrosting\UniformResourceLocator\Resource $file The command resource + * + * @return string The command class path */ protected function getResourceClass(Resource $file) { @@ -144,9 +146,10 @@ protected function getResourceClass(Resource $file) } /** - * Return the classname from the file instance + * Return the classname from the file instance. + * + * @param \UserFrosting\UniformResourceLocator\Resource $file The command resource * - * @param \UserFrosting\UniformResourceLocator\Resource $file The command resource * @return string */ protected function getClassNameFromFile(Resource $file) diff --git a/app/system/Bakery/BaseCommand.php b/app/system/Bakery/BaseCommand.php index f150d47fc..217860fbe 100644 --- a/app/system/Bakery/BaseCommand.php +++ b/app/system/Bakery/BaseCommand.php @@ -1,5 +1,6 @@
          ' . - 'Version: UserFrosting '.\UserFrosting\VERSION.'
          ' . + 'Version: UserFrosting ' . \UserFrosting\VERSION . '
          ' . $errorMessage; $output = sprintf( "" . diff --git a/app/tests/DatabaseTransactions.php b/app/tests/DatabaseTransactions.php index 74844837b..5f914c186 100644 --- a/app/tests/DatabaseTransactions.php +++ b/app/tests/DatabaseTransactions.php @@ -1,5 +1,6 @@ ci->session->destroy(); + + // Close DB connection + $this->ci->db->getDatabaseManager()->disconnect(); + $this->ci = null; } diff --git a/app/tests/Unit/ExampleTest.php b/app/tests/Unit/ExampleTest.php index 69d4c75fc..bc48800b8 100644 --- a/app/tests/Unit/ExampleTest.php +++ b/app/tests/Unit/ExampleTest.php @@ -1,5 +1,6 @@ assertEquals([ 'foo' => null, 'bar' => null, - 'test' => new \UserFrosting\Sprinkle\Test\Test() + 'test' => new \UserFrosting\Sprinkle\Test\Test(), ], $sprinkles); } diff --git a/build/before_install.sh b/build/before_install.sh index b37ce4f7b..637b54eac 100644 --- a/build/before_install.sh +++ b/build/before_install.sh @@ -35,5 +35,16 @@ fi if [ "$DB" == "sqlite" ] ; then echo "Setting up sqlite ..." touch userfrosting.db - printf "UF_MODE=\"debug\"\nDB_DRIVER=\"sqlite\"\nDB_NAME=\"userfrosting.db\"\nTEST_DB=\"default\"\n" > app/.env + printf "UF_MODE=\"debug\"\nDB_DRIVER=\"sqlite\"\nDB_HOST=127.0.0.1\nDB_NAME=\"userfrosting.db\"\nTEST_DB=\"default\"\n" > app/.env +fi + +# +# set up memory +# Need to setup MySQL for the debug part +# +if [ "$DB" == "memory" ] ; then + echo "Setting up in memory sqlite ..." + mysql -u root -e "CREATE DATABASE userfrosting;" + mysql -u root -e "GRANT ALL ON userfrosting.* TO 'travis'@'localhost';" + printf "UF_MODE=\"debug\"\nDB_DRIVER=\"mysql\"\nDB_HOST=\"localhost\"\nDB_PORT=\"3306\"\nDB_NAME=\"userfrosting\"\nDB_USER=\"travis\"\nDB_PASSWORD=\"\"\n" > app/.env fi diff --git a/composer.json b/composer.json index 8a618c63e..bc403c21e 100755 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "vendor-dir": "app/vendor" }, "require": { - "php": ">=5.6", + "php": ">=7.1", "ext-gd": "*", "composer/installers": "^1.4.0", "userfrosting/uniformresourcelocator": "~4.2.3", diff --git a/docker-compose-testdb.yml b/docker-compose-testdb.yml index 7813b06b3..23ea4cda4 100644 --- a/docker-compose-testdb.yml +++ b/docker-compose-testdb.yml @@ -71,19 +71,6 @@ services: volumes: - userfrosting-test-db:/var/lib/mysql - composer: - image: "composer" - volumes: - - .:/app - working_dir: /app - - node: - build: - context: ./docker/node - volumes: - - .:/app - working_dir: /app/build - volumes: userfrosting-db: driver: local diff --git a/docker-compose.yml b/docker-compose.yml index 6ff08f6f5..536b33140 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -49,19 +49,6 @@ services: volumes: - userfrosting-db:/var/lib/mysql - composer: - image: "composer" - volumes: - - .:/app - working_dir: /app - - node: - build: - context: ./docker/node - volumes: - - .:/app - working_dir: /app/build - volumes: userfrosting-db: driver: local diff --git a/docker/README.md b/docker/README.md index 7ce433f49..7a936c6af 100644 --- a/docker/README.md +++ b/docker/README.md @@ -9,34 +9,36 @@ Second, initialize a new UserFrosting project: 1. Copy `app/sprinkles.example.json` to `app/sprinkles.json` 2. Run `chmod 777 app/{logs,cache,sessions}` to fix file permissions for web server. (NOTE: File permissions should be properly secured in a production environment!) -3. Run `docker-compose run composer install --ignore-platform-reqs --no-scripts` to install all composer modules. (https://hub.docker.com/_/composer) Sometimes dependencies or Composer scripts require the availability of certain PHP extensions. You can work around this as follows: Pass the `--ignore-platform-reqs and --no-scripts` flags to install or update -4. Run `docker-compose run node npm install` to install all npm modules. -5. Run `docker-compose run composer update --ignore-platform-reqs --no-scripts` to install remaining composer modules -6. Run `docker-compose run node npm run uf-assets-install` to install all frontend vendor assets. +3. Run `docker run --rm -it --volume ${pwd}:/app composer install --ignore-platform-reqs --no-scripts` to install all composer modules. (https://hub.docker.com/_/composer) Sometimes dependencies or Composer scripts require the availability of certain PHP extensions. You can work around this as follows: Pass the `--ignore-platform-reqs and --no-scripts` flags to install or update +4. Run `docker run --rm -it --volume ${pwd}:/app node:alpine /bin/sh -c "cd /app/build ; npm install; npm run uf-assets-install"` to install all npm modules and frontend vendor assets. Now you can start up the entire Nginx + PHP + MySQL stack using docker with: - $ docker-compose up -d +```bash +$ docker-compose up -d +``` the `-d` flag will launch this in the background so you can continue to use the terminal window. On the first run you need to init the database (your container name may be different depending on the name of your root directory): - $ docker exec -it -u www-data userfrosting_php_1 sh -c 'php bakery migrate' +```bash +$ docker exec -it -u www-data userfrosting_php_1 sh -c 'php bakery migrate' +``` You also need to setup the first admin user (again, your container name may be different depending on the name of your root directory): - $ docker exec -it -u www-data userfrosting_php_1 sh -c 'php bakery create-admin' +```bash +$ docker exec -it -u www-data userfrosting_php_1 sh -c 'php bakery create-admin' +``` Now visit `http://localhost:8591/` to see your UserFrosting homepage! **Paste these into a bash file and execute it!** -``` +```bash chmod 777 app/{logs,cache,sessions} docker-compose build --force-rm --no-cache -docker-compose run composer install --ignore-platform-reqs --no-scripts -docker-compose run node npm install -docker-compose run composer update --ignore-platform-reqs --no-scripts -docker-compose run node npm run uf-assets-install +docker run --rm -it --volume ${pwd}:/app composer update --ignore-platform-reqs --no-scripts +docker run --rm -it --volume ${pwd}:/app node:alpine /bin/sh -c "cd /app/build ; npm install ; npm run uf-assets-install" docker-compose up -d echo -n "Enter Docker Container Name --> " read docker_container diff --git a/docker/node/Dockerfile b/docker/node/Dockerfile deleted file mode 100755 index a985509a7..000000000 --- a/docker/node/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM node:alpine - -RUN apk --update add --no-cache git -RUN echo '{ "allow_root": true }' > /root/.bowerrc \ No newline at end of file diff --git a/public/index.php b/public/index.php index 95b6f339b..a26563f20 100755 --- a/public/index.php +++ b/public/index.php @@ -1,5 +1,6 @@ Date: Thu, 13 Jun 2019 21:53:11 +0000 Subject: [PATCH 10/16] StyleCi and confirmation prompt fix --- .../Migrations/v430/UpdateGroupsTable.php | 8 +++-- .../src/Bakery/SetupFontAwesomeCommand.php | 31 ++++++++++--------- .../core/src/Util/CheckEnvironment.php | 4 +-- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php b/app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php index 976c7e3a1..f1661e43c 100644 --- a/app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php +++ b/app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php @@ -1,5 +1,6 @@ setName("setup:font-awesome"); + $this->setName('setup:font-awesome'); // the short description shown while running "php bakery list" - $this->setDescription("Switch between free/pro versions of Font Awesome"); + $this->setDescription('Switch between free/pro versions of Font Awesome'); } protected function execute(InputInterface $input, OutputInterface $output) @@ -37,10 +37,12 @@ protected function execute(InputInterface $input, OutputInterface $output) // Display header, $this->io->title("UserFrosting's Font Awesome Setup Wizard"); - // Display nice explanation and ask wich method to use - $this->io->write("This setup will configure Font Awesome 5 Pro. Font Awesome 5 Free is already included with UserFrosting."); + // Display nice explanation and ask which method to use + $this->io->write('This setup will configure Font Awesome 5 Pro. Font Awesome 5 Free is already included with UserFrosting.'); - $this->io->confirm('Would you like to continue?'); + if (!$this->io->confirm('Would you like to continue?', false)) { + exit; + } $this->io->note("The Authentication Key will be saved in `{$this->buildPath}/.npmrc`"); $this->io->write('Please enter your Font Awesome Authentication Key to begin. This will be used to download the neccessary packages.'); @@ -52,7 +54,6 @@ protected function execute(InputInterface $input, OutputInterface $output) $wd = getcwd(); chdir($this->buildPath); - // Delete any Font Awesome settings in .npmrc but leave other lines untouched. passthru("sed '/npm.fontawesome.com/d' -i .npmrc"); diff --git a/app/sprinkles/core/src/Util/CheckEnvironment.php b/app/sprinkles/core/src/Util/CheckEnvironment.php index 2ed2ffd64..0487c8f41 100644 --- a/app/sprinkles/core/src/Util/CheckEnvironment.php +++ b/app/sprinkles/core/src/Util/CheckEnvironment.php @@ -367,8 +367,8 @@ public function checkPhp() } else { $this->resultsSuccess['phpVersion'] = [ 'title' => " PHP version checks out!", - 'message' => "You're using PHP " . \UserFrosting\PHP_MIN_VERSION . 'or higher. Great!', - 'success' => true + 'message' => "You're using PHP " . \UserFrosting\PHP_MIN_VERSION . 'or higher. Great!', + 'success' => true, ]; } From 11d018bc04b6968eddd2462d36d78fbc3e9a716b Mon Sep 17 00:00:00 2001 From: Amos Folz Date: Wed, 19 Jun 2019 02:20:43 +0000 Subject: [PATCH 11/16] Remove default(null) from up --- .../account/src/Database/Migrations/v430/UpdateGroupsTable.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php b/app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php index f1661e43c..8391d72d3 100644 --- a/app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php +++ b/app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php @@ -38,7 +38,7 @@ public function up() { if ($this->schema->hasTable('groups')) { $this->schema->table('groups', function (Blueprint $table) { - $table->string('icon', 100)->default(null)->nullable(true)->change(); + $table->string('icon', 100)->nullable()->change(); }); } } From 007e9cb70cd9b3f46f178d509b8ce92b5e98f158 Mon Sep 17 00:00:00 2001 From: amosfolz <33728190+amosfolz@users.noreply.github.com> Date: Sun, 14 Jul 2019 09:56:17 -0400 Subject: [PATCH 12/16] Update package.json Change to font awesome to version 5.9 --- app/sprinkles/core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/sprinkles/core/package.json b/app/sprinkles/core/package.json index 3ea6a25c3..6b6064fdf 100644 --- a/app/sprinkles/core/package.json +++ b/app/sprinkles/core/package.json @@ -1,7 +1,7 @@ { "private": true, "dependencies": { - "@fortawesome/fontawesome-free": "^5.8.1", + "@fortawesome/fontawesome-free": "^5.9", "bootstrap": "^3.3.6", "clipboard": "^1.5.16", "fastclick": "^1.0.6", From 4ae024b3133fcaefd7a650250b50b6d9153b1f31 Mon Sep 17 00:00:00 2001 From: amosfolz <33728190+amosfolz@users.noreply.github.com> Date: Sun, 14 Jul 2019 10:13:39 -0400 Subject: [PATCH 13/16] Update icons for Font Awesome 5 update fa-trash-alt to fa-trash-o and fa-gear to fa-cog --- .../account/templates/forms/settings-account.html.twig | 4 ++-- app/sprinkles/admin/templates/pages/group.html.twig | 4 ++-- app/sprinkles/admin/templates/pages/role.html.twig | 4 ++-- app/sprinkles/admin/templates/pages/user.html.twig | 4 ++-- app/sprinkles/admin/templates/tables/groups.html.twig | 2 +- app/sprinkles/admin/templates/tables/roles.html.twig | 2 +- app/sprinkles/admin/templates/tables/users.html.twig | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/sprinkles/account/templates/forms/settings-account.html.twig b/app/sprinkles/account/templates/forms/settings-account.html.twig index 425125168..993a52af2 100644 --- a/app/sprinkles/account/templates/forms/settings-account.html.twig +++ b/app/sprinkles/account/templates/forms/settings-account.html.twig @@ -1,6 +1,6 @@
          -

          {{translate("ACCOUNT.SETTINGS")}}

          +

          {{translate("ACCOUNT.SETTINGS")}}

          {% include "forms/csrf.html.twig" %} @@ -34,4 +34,4 @@
          -
          \ No newline at end of file + diff --git a/app/sprinkles/admin/templates/pages/group.html.twig b/app/sprinkles/admin/templates/pages/group.html.twig index f51b7757e..ca25cba90 100644 --- a/app/sprinkles/admin/templates/pages/group.html.twig +++ b/app/sprinkles/admin/templates/pages/group.html.twig @@ -20,7 +20,7 @@
          From c3dd512296e1b7d8566f8cddd8364da62620868c Mon Sep 17 00:00:00 2001 From: amosfolz <33728190+amosfolz@users.noreply.github.com> Date: Sun, 14 Jul 2019 13:22:58 -0400 Subject: [PATCH 14/16] Update UpdateGroupsTable.php --- .../account/src/Database/Migrations/v430/UpdateGroupsTable.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php b/app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php index 8391d72d3..7405ade67 100644 --- a/app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php +++ b/app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php @@ -49,7 +49,7 @@ public function up() public function down() { $this->schema->table('groups', function (Blueprint $table) { - $table->string('icon', 100)->default('fas fa-user')->nullable(false)->change(); + $table->string('icon', 100)->default('fa fa-user')->nullable(false)->change(); }); } } From b5d80605b8be7a66253a65bbb722ac376ac0b1a1 Mon Sep 17 00:00:00 2001 From: amosfolz <33728190+amosfolz@users.noreply.github.com> Date: Sun, 14 Jul 2019 13:57:29 -0400 Subject: [PATCH 15/16] Fix AdmiteLTE.js --- .../core/assets/userfrosting/js/AdminLTE.js | 300 +++++++++--------- 1 file changed, 151 insertions(+), 149 deletions(-) diff --git a/app/sprinkles/core/assets/userfrosting/js/AdminLTE.js b/app/sprinkles/core/assets/userfrosting/js/AdminLTE.js index ed630625c..1dbdd9f55 100644 --- a/app/sprinkles/core/assets/userfrosting/js/AdminLTE.js +++ b/app/sprinkles/core/assets/userfrosting/js/AdminLTE.js @@ -623,152 +623,154 @@ function _init() { */ (function($) { - "use strict"; - - $.fn.boxRefresh = function(options) { - - // Render options - var settings = $.extend({ - //Refresh button selector - trigger: ".refresh-btn", - //File source to be loaded (e.g: ajax/src.php) - source: "", - //Callbacks - onLoadStart: function(box) { - return box; - }, //Right after the button has been clicked - onLoadDone: function(box) { - return box; - } //When the source has been loaded - - }, options); - - //The overlay - var overlay = $('
          '); - - return this.each(function() { - //if a source is specified - if (settings.source === "") { - if (window.console) { - window.console.log("Please specify a source first - boxRefresh()"); - } - return; - } - //the box - var box = $(this); - //the button - var rBtn = box.find(settings.trigger).first(); - - //On trigger click - rBtn.on('click', function(e) { - e.preventDefault(); - //Add loading overlay - start(box); - - //Perform ajax call - box.find(".box-body").load(settings.source, function() { - done(box); - }); - - function start(box) { - //Add overlay and loading img - box.append(overlay); - - settings.onLoadStart.call(box); - } - - function done(box) { - //Remove overlay and loading img - box.find(overlay).remove(); - - settings.onLoadDone.call(box); - } - - }; - - })(jQuery); - - /* - * EXPLICIT BOX CONTROLS - * ----------------------- - * This is a custom plugin to use with the component BOX. It allows you to activate - * a box inserted in the DOM after the app.js was loaded, toggle and remove box. - * - * @type plugin - * @usage $("#box-widget").activateBox(); - * @usage $("#box-widget").toggleBox(); - * @usage $("#box-widget").removeBox(); - */ - (function($) { - - 'use strict'; - - $.fn.activateBox = function() { - $.AdminLTE.boxWidget.activate(this); - }; - - $.fn.toggleBox = function() { - var button = $($.AdminLTE.boxWidget.selectors.collapse, this); - $.AdminLTE.boxWidget.collapse(button); - }; - - $.fn.removeBox = function() { - var button = $($.AdminLTE.boxWidget.selectors.remove, this); - $.AdminLTE.boxWidget.remove(button); - }; - - })(jQuery); - - /* - * TODO LIST CUSTOM PLUGIN - * ----------------------- - * This plugin depends on iCheck plugin for checkbox and radio inputs - * - * @type plugin - * @usage $("#todo-widget").todolist( options ); - */ - (function($) { - - 'use strict'; - - $.fn.todolist = function(options) { - // Render options - var settings = $.extend({ - //When the user checks the input - onCheck: function(ele) { - return ele; - }, - //When the user unchecks the input - onUncheck: function(ele) { - return ele; - } - }, options); - - return this.each(function() { - - if (typeof $.fn.iCheck != 'undefined') { - $('input', this).on('ifChecked', function() { - var ele = $(this).parents("li").first(); - ele.toggleClass("done"); - settings.onCheck.call(ele); - }); - - $('input', this).on('ifUnchecked', function() { - var ele = $(this).parents("li").first(); - ele.toggleClass("done"); - settings.onUncheck.call(ele); - }); - } else { - $('input', this).on('change', function() { - var ele = $(this).parents("li").first(); - ele.toggleClass("done"); - if ($('input', ele).is(":checked")) { - settings.onCheck.call(ele); - } else { - settings.onUncheck.call(ele); - } - }); - } - }); - }; - }(jQuery)); \ No newline at end of file + "use strict"; + + $.fn.boxRefresh = function(options) { + + // Render options + var settings = $.extend({ + //Refresh button selector + trigger: ".refresh-btn", + //File source to be loaded (e.g: ajax/src.php) + source: "", + //Callbacks + onLoadStart: function(box) { + return box; + }, //Right after the button has been clicked + onLoadDone: function(box) { + return box; + } //When the source has been loaded + + }, options); + + //The overlay + var overlay = $('
          '); + + return this.each(function() { + //if a source is specified + if (settings.source === "") { + if (window.console) { + window.console.log("Please specify a source first - boxRefresh()"); + } + return; + } + //the box + var box = $(this); + //the button + var rBtn = box.find(settings.trigger).first(); + + //On trigger click + rBtn.on('click', function(e) { + e.preventDefault(); + //Add loading overlay + start(box); + + //Perform ajax call + box.find(".box-body").load(settings.source, function() { + done(box); + }); + }); + }); + + function start(box) { + //Add overlay and loading img + box.append(overlay); + + settings.onLoadStart.call(box); + } + + function done(box) { + //Remove overlay and loading img + box.find(overlay).remove(); + + settings.onLoadDone.call(box); + } + + }; + +})(jQuery); + +/* + * EXPLICIT BOX CONTROLS + * ----------------------- + * This is a custom plugin to use with the component BOX. It allows you to activate + * a box inserted in the DOM after the app.js was loaded, toggle and remove box. + * + * @type plugin + * @usage $("#box-widget").activateBox(); + * @usage $("#box-widget").toggleBox(); + * @usage $("#box-widget").removeBox(); + */ +(function($) { + + 'use strict'; + + $.fn.activateBox = function() { + $.AdminLTE.boxWidget.activate(this); + }; + + $.fn.toggleBox = function() { + var button = $($.AdminLTE.boxWidget.selectors.collapse, this); + $.AdminLTE.boxWidget.collapse(button); + }; + + $.fn.removeBox = function() { + var button = $($.AdminLTE.boxWidget.selectors.remove, this); + $.AdminLTE.boxWidget.remove(button); + }; + +})(jQuery); + +/* + * TODO LIST CUSTOM PLUGIN + * ----------------------- + * This plugin depends on iCheck plugin for checkbox and radio inputs + * + * @type plugin + * @usage $("#todo-widget").todolist( options ); + */ +(function($) { + + 'use strict'; + + $.fn.todolist = function(options) { + // Render options + var settings = $.extend({ + //When the user checks the input + onCheck: function(ele) { + return ele; + }, + //When the user unchecks the input + onUncheck: function(ele) { + return ele; + } + }, options); + + return this.each(function() { + + if (typeof $.fn.iCheck != 'undefined') { + $('input', this).on('ifChecked', function() { + var ele = $(this).parents("li").first(); + ele.toggleClass("done"); + settings.onCheck.call(ele); + }); + + $('input', this).on('ifUnchecked', function() { + var ele = $(this).parents("li").first(); + ele.toggleClass("done"); + settings.onUncheck.call(ele); + }); + } else { + $('input', this).on('change', function() { + var ele = $(this).parents("li").first(); + ele.toggleClass("done"); + if ($('input', ele).is(":checked")) { + settings.onCheck.call(ele); + } else { + settings.onUncheck.call(ele); + } + }); + } + }); + }; +}(jQuery)); \ No newline at end of file From 5a3d5467cf0cc4df1950554d806d79cb31f5f7f5 Mon Sep 17 00:00:00 2001 From: amosfolz <33728190+amosfolz@users.noreply.github.com> Date: Sun, 14 Jul 2019 14:04:47 -0400 Subject: [PATCH 16/16] Delete SetupFontAwesomeCommand.php --- .../src/Bakery/SetupFontAwesomeCommand.php | 69 ------------------- 1 file changed, 69 deletions(-) delete mode 100644 app/sprinkles/core/src/Bakery/SetupFontAwesomeCommand.php diff --git a/app/sprinkles/core/src/Bakery/SetupFontAwesomeCommand.php b/app/sprinkles/core/src/Bakery/SetupFontAwesomeCommand.php deleted file mode 100644 index 02acf11ef..000000000 --- a/app/sprinkles/core/src/Bakery/SetupFontAwesomeCommand.php +++ /dev/null @@ -1,69 +0,0 @@ -setName('setup:font-awesome'); - - // the short description shown while running "php bakery list" - $this->setDescription('Switch between free/pro versions of Font Awesome'); - } - - protected function execute(InputInterface $input, OutputInterface $output) - { - // Display header, - $this->io->title("UserFrosting's Font Awesome Setup Wizard"); - - // Display nice explanation and ask which method to use - $this->io->write('This setup will configure Font Awesome 5 Pro. Font Awesome 5 Free is already included with UserFrosting.'); - - if (!$this->io->confirm('Would you like to continue?', false)) { - exit; - } - - $this->io->note("The Authentication Key will be saved in `{$this->buildPath}/.npmrc`"); - $this->io->write('Please enter your Font Awesome Authentication Key to begin. This will be used to download the neccessary packages.'); - - // Ask for Font Awesome authentication key - $newAuthKey = $this->io->ask('What is Font Awesome Authentication key?'); - - // Temporarily change the working directory (more reliable than --prefix npm switch) - $wd = getcwd(); - chdir($this->buildPath); - - // Delete any Font Awesome settings in .npmrc but leave other lines untouched. - passthru("sed '/npm.fontawesome.com/d' -i .npmrc"); - - // Add the registry setting and new auth key to .npmc. - passthru("printf '%s\n' '@fortawesome:registry=https://npm.fontawesome.com/' '//npm.fontawesome.com/:_authToken=$newAuthKey' >>.npmrc"); - - // Install Font Awesome Pro Package. - $this->io->writeln('> npm install --save-dev @fortawesome/fontawesome-pro'); - passthru('npm install --save-dev @fortawesome/fontawesome-pro'); - - chdir($wd); - } -}