Merge branch 'develop' of https://github.com/userfrosting/UserFrosting into develop-jordan

Author: Silic0nS0ldier

.travis.yml

@@ -19,6 +19,10 @@ env:
     - DB=sqlite
     - DB=pgsql
 
+cache:
+  directories:
+    - $HOME/.composer/cache
+    
 before_install:
   # copy sprinkles.json
   - cp app/sprinkles.example.json app/sprinkles.json

CHANGELOG.md

@@ -5,7 +5,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## 4.2.0
+## 4.2.0-beta.2
+
+### Added
+- Added `sprinkle:list` bakery command
+- Changed the sprinkle list in the bakery `debug` command to use the new `sprinkle:list` table
+
+### Fix
+- Fix for `Test` Bakery command
+    - Added `coverage-format` and `coverage-path` options to `test` Bakery command
+    - Sprinkle Testscope is now case insensitive
+    - **Class testscope now relative to `/` instead of `/UserFrosting/Sprinkle/` for more intuitive usage and to enable testing of non sprinkle tests**
+    - Detect and use the sprinkle `phpunit.xml` config when testing a specific sprinkle
+- SprinkleManager Improvements :
+    - Added public `getSprinklePath` method to get path to the sprinkle directory
+    - Added public `getSprinkleClassNamespace` method to get sprinkle base namespace
+    - Added public `getSprinkle` method. Returns the sprinkle name as formatted in `sprinkles.json` file, independent of the case of the search argument.
+    - Public `isAvailable` method now case insensitive.
+    - Added public `getSprinklesPath` & `setSprinklesPath` to return or set the path to the sprinkle dir (`app/sprinkles/`)
+    - Added `JsonException` if `sprinkles.json` doesn't contain valid json.
+    - Added specific tests for sprinkleManager with 100% test coverage
+
+## 4.2.0-beta.1
 
 ### Changed Requirements
 - Changed minimum Node.js version to **v10.12.0**

app/sprinkles/account/routes/routes.php

@@ -7,6 +7,8 @@
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
  */
 
+use UserFrosting\Sprinkle\Core\Util\NoCache;
+
 $app->group('/account', function () {
     $this->get('/captcha', 'UserFrosting\Sprinkle\Account\Controller\AccountController:imageCaptcha');
 
@@ -55,6 +57,6 @@
 
     $this->post('/settings/profile', 'UserFrosting\Sprinkle\Account\Controller\AccountController:profile')
         ->add('authGuard');
-});
+})->add(new NoCache());
 
 $app->get('/modals/account/tos', 'UserFrosting\Sprinkle\Account\Controller\AccountController:getModalAccountTos');

app/sprinkles/account/tests/Integration/AuthorizationManagerTest.php

@@ -131,7 +131,7 @@ public function testCheckAccess_withNormalUser()
         $authLogger->shouldReceive('debug')->once()->with('No matching permissions found. Access denied.');
         $authLogger->shouldReceive('debug')->times(2);
 
-        $this->assertFalse($this->getManager()->checkAccess($user, 'foo'));
+        $this->assertFalse($this->getManager()->checkAccess($user, 'blah'));
     }
 
     /**

app/sprinkles/admin/routes/activities.php

@@ -7,14 +7,16 @@
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
  */
 
+use UserFrosting\Sprinkle\Core\Util\NoCache;
+
 /**
  * Routes for administrative activity monitoring.
  */
 $app->group('/activities', function () {
     $this->get('', 'UserFrosting\Sprinkle\Admin\Controller\ActivityController:pageList')
         ->setName('uri_activities');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());
 
 $app->group('/api/activities', function () {
     $this->get('', 'UserFrosting\Sprinkle\Admin\Controller\ActivityController:getList');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());

app/sprinkles/admin/routes/admin.php

@@ -7,18 +7,20 @@
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
  */
 
+use UserFrosting\Sprinkle\Core\Util\NoCache;
+
 /**
  * Routes for administrative panel management.
  */
 $app->group('/dashboard', function () {
     $this->get('', 'UserFrosting\Sprinkle\Admin\Controller\AdminController:pageDashboard')
          ->setName('dashboard');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());
 
 $app->group('/api/dashboard', function () {
     $this->post('/clear-cache', 'UserFrosting\Sprinkle\Admin\Controller\AdminController:clearCache');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());
 
 $app->group('/modals/dashboard', function () {
     $this->get('/clear-cache', 'UserFrosting\Sprinkle\Admin\Controller\AdminController:getModalConfirmClearCache');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());

app/sprinkles/admin/routes/groups.php

@@ -7,6 +7,8 @@
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
  */
 
+use UserFrosting\Sprinkle\Core\Util\NoCache;
+
 /**
  * Routes for administrative group management.
  */
@@ -15,7 +17,7 @@
         ->setName('uri_groups');
 
     $this->get('/g/{slug}', 'UserFrosting\Sprinkle\Admin\Controller\GroupController:pageInfo');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());
 
 $app->group('/api/groups', function () {
     $this->delete('/g/{slug}', 'UserFrosting\Sprinkle\Admin\Controller\GroupController:delete');
@@ -29,12 +31,12 @@
     $this->post('', 'UserFrosting\Sprinkle\Admin\Controller\GroupController:create');
 
     $this->put('/g/{slug}', 'UserFrosting\Sprinkle\Admin\Controller\GroupController:updateInfo');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());
 
 $app->group('/modals/groups', function () {
     $this->get('/confirm-delete', 'UserFrosting\Sprinkle\Admin\Controller\GroupController:getModalConfirmDelete');
 
     $this->get('/create', 'UserFrosting\Sprinkle\Admin\Controller\GroupController:getModalCreate');
 
     $this->get('/edit', 'UserFrosting\Sprinkle\Admin\Controller\GroupController:getModalEdit');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());

app/sprinkles/admin/routes/permissions.php

@@ -7,6 +7,8 @@
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
  */
 
+use UserFrosting\Sprinkle\Core\Util\NoCache;
+
 /**
  * Routes for administrative permission management.
  */
@@ -15,12 +17,12 @@
         ->setName('uri_permissions');
 
     $this->get('/p/{id}', 'UserFrosting\Sprinkle\Admin\Controller\PermissionController:pageInfo');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());
 
 $app->group('/api/permissions', function () {
     $this->get('', 'UserFrosting\Sprinkle\Admin\Controller\PermissionController:getList');
 
     $this->get('/p/{id}', 'UserFrosting\Sprinkle\Admin\Controller\PermissionController:getInfo');
 
     $this->get('/p/{id}/users', 'UserFrosting\Sprinkle\Admin\Controller\PermissionController:getUsers');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());

app/sprinkles/admin/routes/roles.php

@@ -7,6 +7,8 @@
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
  */
 
+use UserFrosting\Sprinkle\Core\Util\NoCache;
+
 /**
  * Routes for administrative role management.
  */
@@ -15,7 +17,7 @@
         ->setName('uri_roles');
 
     $this->get('/r/{slug}', 'UserFrosting\Sprinkle\Admin\Controller\RoleController:pageInfo');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());
 
 $app->group('/api/roles', function () {
     $this->delete('/r/{slug}', 'UserFrosting\Sprinkle\Admin\Controller\RoleController:delete');
@@ -33,7 +35,7 @@
     $this->put('/r/{slug}', 'UserFrosting\Sprinkle\Admin\Controller\RoleController:updateInfo');
 
     $this->put('/r/{slug}/{field}', 'UserFrosting\Sprinkle\Admin\Controller\RoleController:updateField');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());
 
 $app->group('/modals/roles', function () {
     $this->get('/confirm-delete', 'UserFrosting\Sprinkle\Admin\Controller\RoleController:getModalConfirmDelete');
@@ -43,4 +45,4 @@
     $this->get('/edit', 'UserFrosting\Sprinkle\Admin\Controller\RoleController:getModalEdit');
 
     $this->get('/permissions', 'UserFrosting\Sprinkle\Admin\Controller\RoleController:getModalEditPermissions');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());

app/sprinkles/admin/routes/users.php

@@ -7,6 +7,8 @@
  * @license   https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
  */
 
+use UserFrosting\Sprinkle\Core\Util\NoCache;
+
 /**
  * Routes for administrative user management.
  */
@@ -15,7 +17,7 @@
         ->setName('uri_users');
 
     $this->get('/u/{user_name}', 'UserFrosting\Sprinkle\Admin\Controller\UserController:pageInfo');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());
 
 $app->group('/api/users', function () {
     $this->delete('/u/{user_name}', 'UserFrosting\Sprinkle\Admin\Controller\UserController:delete');
@@ -37,7 +39,7 @@
     $this->put('/u/{user_name}', 'UserFrosting\Sprinkle\Admin\Controller\UserController:updateInfo');
 
     $this->put('/u/{user_name}/{field}', 'UserFrosting\Sprinkle\Admin\Controller\UserController:updateField');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());
 
 $app->group('/modals/users', function () {
     $this->get('/confirm-delete', 'UserFrosting\Sprinkle\Admin\Controller\UserController:getModalConfirmDelete');
@@ -49,4 +51,4 @@
     $this->get('/password', 'UserFrosting\Sprinkle\Admin\Controller\UserController:getModalEditPassword');
 
     $this->get('/roles', 'UserFrosting\Sprinkle\Admin\Controller\UserController:getModalEditRoles');
-})->add('authGuard');
+})->add('authGuard')->add(new NoCache());