Skip to content

Commit 0ee8c54

Browse files
author
Anton
authored
Merge pull request #11 from bluzphp/develop
Updated requirejs config
2 parents d231e82 + 4335dc7 commit 0ee8c54

File tree

13 files changed

+17449
-1014
lines changed

13 files changed

+17449
-1014
lines changed

.eslintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "airbnb-es5"
3+
}

.scrutinizer.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
checks:
2+
php:
3+
psr2_switch_declaration: true
4+
psr2_class_declaration: true
5+
no_short_open_tag: true
6+
deprecated_code_usage: true
7+
code_rating: true
8+
filter:
9+
excluded_paths:
10+
- 'tests/*'
11+
- 'public/js/vendor/*'
12+
checks:
13+
php: true
14+
javascript: true
15+
tools:
16+
php_analyzer: true
17+
php_code_sniffer:
18+
config:
19+
standard: PSR2

.stylelintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "stylelint-config-standard"
3+
}

application/modules/test/api.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,20 @@
2121
* @SWG\Response(response=206, description="Collection present")
2222
* )
2323
*
24-
*
2524
* @SWG\Put(
2625
* path="/test/rest/",
2726
* tags={"test"},
2827
* operationId="updateTestCollection",
2928
* summary="Try to update Collection",
30-
* @SWG\Response(response=501, description="Not Implemented", @SWG\Schema(ref="#/definitions/errorModel"))
29+
* @SWG\Response(@SWG\Schema(ref="#/definitions/error"), response=501, description="Not Implemented")
3130
* )
3231
*
3332
* @SWG\Delete(
3433
* path="/test/rest/",
3534
* tags={"test"},
3635
* operationId="deleteTestCollection",
3736
* summary="Try to delete Collection",
38-
* @SWG\Response(response=400, description="Not Found", @SWG\Schema(ref="#/definitions/errorModel"))
37+
* @SWG\Response(@SWG\Schema(ref="#/definitions/error"), response=400, description="Not Found")
3938
* )
4039
*/
4140

@@ -52,8 +51,8 @@
5251
* required=true,
5352
* type="integer"
5453
* ),
55-
* @SWG\Response(response=200, description="Given item found", @SWG\Schema(ref="#/definitions/test")),
56-
* @SWG\Response(response=404, description="Item not found", @SWG\Schema(ref="#/definitions/errorModel"))
54+
* @SWG\Response(@SWG\Schema(ref="#/definitions/test"), response=200, description="Given item found"),
55+
* @SWG\Response(@SWG\Schema(ref="#/definitions/error"), response=404, description="Item not found")
5756
* )
5857
*
5958
* @SWG\Post(
@@ -91,7 +90,7 @@
9190
* required=true,
9291
* type="integer"
9392
* ),
94-
* @SWG\Response(response=501, description="Not Implemented", @SWG\Schema(ref="#/definitions/errorModel"))
93+
* @SWG\Response(@SWG\Schema(ref="#/definitions/error"), response=501, description="Not Implemented")
9594
* )
9695
*
9796
* @SWG\Put(
@@ -120,7 +119,7 @@
120119
* required=false,
121120
* type="string",
122121
* ),
123-
* @SWG\Response(response=404, description="Item not found", @SWG\Schema(ref="#/definitions/errorModel"))
122+
* @SWG\Response(@SWG\Schema(ref="#/definitions/error"), response=404, description="Item not found")
124123
* )
125124
*
126125
* @SWG\Delete(

application/modules/test/controllers/index.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* @var Controller $this
2121
*/
2222
Layout::title('Test Module');
23-
Layout::title('Append', Layout::POS_APPEND);
24-
Layout::title('Prepend', Layout::POS_PREPEND);
23+
Layout::titleAppend('Append');
24+
Layout::titlePrepend('Prepend');
2525
Layout::breadCrumbs([ 'Test' ]);
2626
};

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"description": "Bluz test module",
66
"require": {
7-
"bluzphp/composer-plugin": "~2.0",
7+
"bluzphp/composer-plugin": "~2.1",
88
"fzaninotto/faker": "~1.6"
99
}
1010
}

0 commit comments

Comments
 (0)