Skip to content

Commit

Permalink
Merge pull request #11 from bluzphp/develop
Browse files Browse the repository at this point in the history
Updated requirejs config
  • Loading branch information
Anton authored Sep 28, 2017
2 parents d231e82 + 4335dc7 commit 0ee8c54
Show file tree
Hide file tree
Showing 13 changed files with 17,449 additions and 1,014 deletions.
3 changes: 3 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "airbnb-es5"
}
19 changes: 19 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
checks:
php:
psr2_switch_declaration: true
psr2_class_declaration: true
no_short_open_tag: true
deprecated_code_usage: true
code_rating: true
filter:
excluded_paths:
- 'tests/*'
- 'public/js/vendor/*'
checks:
php: true
javascript: true
tools:
php_analyzer: true
php_code_sniffer:
config:
standard: PSR2
3 changes: 3 additions & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "stylelint-config-standard"
}
13 changes: 6 additions & 7 deletions application/modules/test/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,20 @@
* @SWG\Response(response=206, description="Collection present")
* )
*
*
* @SWG\Put(
* path="/test/rest/",
* tags={"test"},
* operationId="updateTestCollection",
* summary="Try to update Collection",
* @SWG\Response(response=501, description="Not Implemented", @SWG\Schema(ref="#/definitions/errorModel"))
* @SWG\Response(@SWG\Schema(ref="#/definitions/error"), response=501, description="Not Implemented")
* )
*
* @SWG\Delete(
* path="/test/rest/",
* tags={"test"},
* operationId="deleteTestCollection",
* summary="Try to delete Collection",
* @SWG\Response(response=400, description="Not Found", @SWG\Schema(ref="#/definitions/errorModel"))
* @SWG\Response(@SWG\Schema(ref="#/definitions/error"), response=400, description="Not Found")
* )
*/

Expand All @@ -52,8 +51,8 @@
* required=true,
* type="integer"
* ),
* @SWG\Response(response=200, description="Given item found", @SWG\Schema(ref="#/definitions/test")),
* @SWG\Response(response=404, description="Item not found", @SWG\Schema(ref="#/definitions/errorModel"))
* @SWG\Response(@SWG\Schema(ref="#/definitions/test"), response=200, description="Given item found"),
* @SWG\Response(@SWG\Schema(ref="#/definitions/error"), response=404, description="Item not found")
* )
*
* @SWG\Post(
Expand Down Expand Up @@ -91,7 +90,7 @@
* required=true,
* type="integer"
* ),
* @SWG\Response(response=501, description="Not Implemented", @SWG\Schema(ref="#/definitions/errorModel"))
* @SWG\Response(@SWG\Schema(ref="#/definitions/error"), response=501, description="Not Implemented")
* )
*
* @SWG\Put(
Expand Down Expand Up @@ -120,7 +119,7 @@
* required=false,
* type="string",
* ),
* @SWG\Response(response=404, description="Item not found", @SWG\Schema(ref="#/definitions/errorModel"))
* @SWG\Response(@SWG\Schema(ref="#/definitions/error"), response=404, description="Item not found")
* )
*
* @SWG\Delete(
Expand Down
4 changes: 2 additions & 2 deletions application/modules/test/controllers/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* @var Controller $this
*/
Layout::title('Test Module');
Layout::title('Append', Layout::POS_APPEND);
Layout::title('Prepend', Layout::POS_PREPEND);
Layout::titleAppend('Append');
Layout::titlePrepend('Prepend');
Layout::breadCrumbs([ 'Test' ]);
};
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"description": "Bluz test module",
"require": {
"bluzphp/composer-plugin": "~2.0",
"bluzphp/composer-plugin": "~2.1",
"fzaninotto/faker": "~1.6"
}
}
Loading

0 comments on commit 0ee8c54

Please sign in to comment.