Skip to content

Commit 0b2535e

Browse files
authored
Merge pull request #4 from w3bdesign/dev
Testing Git hooks
2 parents ff67f31 + e5556d4 commit 0b2535e

File tree

6 files changed

+181
-100
lines changed

6 files changed

+181
-100
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
"laravel/sail": "^0.0.5",
2222
"mockery/mockery": "^1.4.2",
2323
"nunomaduro/collision": "^5.0",
24-
"phpunit/phpunit": "^9.3.3"
24+
"phpunit/phpunit": "^9.3.3",
25+
"squizlabs/php_codesniffer": "^3.5"
2526
},
2627
"config": {
2728
"optimize-autoloader": true,

composer.lock

Lines changed: 57 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/logging.php

Lines changed: 94 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -6,99 +6,99 @@
66

77
return array(
88

9-
/*
10-
|--------------------------------------------------------------------------
11-
| Default Log Channel
12-
|--------------------------------------------------------------------------
13-
|
14-
| This option defines the default log channel that gets used when writing
15-
| messages to the logs. The name specified in this option should match
16-
| one of the channels defined in the "channels" configuration array.
17-
|
18-
*/
19-
20-
'default' => env( 'LOG_CHANNEL', 'stack' ),
21-
22-
/*
23-
|--------------------------------------------------------------------------
24-
| Log Channels
25-
|--------------------------------------------------------------------------
26-
|
27-
| Here you may configure the log channels for your application. Out of
28-
| the box, Laravel uses the Monolog PHP logging library. This gives
29-
| you a variety of powerful log handlers / formatters to utilize.
30-
|
31-
| Available Drivers: "single", "daily", "slack", "syslog",
32-
| "errorlog", "monolog",
33-
| "custom", "stack"
34-
|
35-
*/
36-
37-
'channels' => array(
38-
'stack' => array(
39-
'driver' => 'stack',
40-
'channels' => array( 'single' ),
41-
'ignore_exceptions' => false,
42-
),
43-
44-
'single' => array(
45-
'driver' => 'errorlog',
46-
'path' => storage_path( 'logs/laravel.log' ),
47-
'level' => env( 'LOG_LEVEL', 'debug' ),
48-
),
49-
50-
'daily' => array(
51-
'driver' => 'errorlog',
52-
'path' => storage_path( 'logs/laravel.log' ),
53-
'level' => env( 'LOG_LEVEL', 'debug' ),
54-
'days' => 14,
55-
),
56-
57-
'slack' => array(
58-
'driver' => 'errorlog',
59-
'url' => env( 'LOG_SLACK_WEBHOOK_URL' ),
60-
'username' => 'Laravel Log',
61-
'emoji' => ':boom:',
62-
'level' => env( 'LOG_LEVEL', 'critical' ),
63-
),
64-
65-
'papertrail' => array(
66-
'driver' => 'errorlog',
67-
'level' => env( 'LOG_LEVEL', 'debug' ),
68-
'handler' => SyslogUdpHandler::class,
69-
'handler_with' => array(
70-
'host' => env( 'PAPERTRAIL_URL' ),
71-
'port' => env( 'PAPERTRAIL_PORT' ),
72-
),
73-
),
74-
75-
'stderr' => array(
76-
'driver' => 'errorlog',
77-
'handler' => StreamHandler::class,
78-
'formatter' => env( 'LOG_STDERR_FORMATTER' ),
79-
'with' => array(
80-
'stream' => 'php://stderr',
81-
),
82-
),
83-
84-
'syslog' => array(
85-
'driver' => 'errorlog',
86-
'level' => env( 'LOG_LEVEL', 'debug' ),
87-
),
88-
89-
'errorlog' => array(
90-
'driver' => 'errorlog',
91-
'level' => env( 'LOG_LEVEL', 'debug' ),
92-
),
93-
94-
'null' => array(
95-
'driver' => 'errorlog',
96-
'handler' => NullHandler::class,
97-
),
98-
99-
'emergency' => array(
100-
'path' => storage_path( 'logs/laravel.log' ),
101-
),
102-
),
9+
/*
10+
|--------------------------------------------------------------------------
11+
| Default Log Channel
12+
|--------------------------------------------------------------------------
13+
|
14+
| This option defines the default log channel that gets used when writing
15+
| messages to the logs. The name specified in this option should match
16+
| one of the channels defined in the "channels" configuration array.
17+
|
18+
*/
19+
20+
'default' => env('LOG_CHANNEL', 'stack'),
21+
22+
/*
23+
|--------------------------------------------------------------------------
24+
| Log Channels
25+
|--------------------------------------------------------------------------
26+
|
27+
| Here you may configure the log channels for your application. Out of
28+
| the box, Laravel uses the Monolog PHP logging library. This gives
29+
| you a variety of powerful log handlers / formatters to utilize.
30+
|
31+
| Available Drivers: "single", "daily", "slack", "syslog",
32+
| "errorlog", "monolog",
33+
| "custom", "stack"
34+
|
35+
*/
36+
37+
'channels' => array(
38+
'stack' => array(
39+
'driver' => 'stack',
40+
'channels' => array( 'single' ),
41+
'ignore_exceptions' => false,
42+
),
43+
44+
'single' => array(
45+
'driver' => 'errorlog',
46+
'path' => storage_path('logs/laravel.log'),
47+
'level' => env('LOG_LEVEL', 'debug'),
48+
),
49+
50+
'daily' => array(
51+
'driver' => 'errorlog',
52+
'path' => storage_path('logs/laravel.log'),
53+
'level' => env('LOG_LEVEL', 'debug'),
54+
'days' => 14,
55+
),
56+
57+
'slack' => array(
58+
'driver' => 'errorlog',
59+
'url' => env('LOG_SLACK_WEBHOOK_URL'),
60+
'username' => 'Laravel Log',
61+
'emoji' => ':boom:',
62+
'level' => env('LOG_LEVEL', 'critical'),
63+
),
64+
65+
'papertrail' => array(
66+
'driver' => 'errorlog',
67+
'level' => env('LOG_LEVEL', 'debug'),
68+
'handler' => SyslogUdpHandler::class,
69+
'handler_with' => array(
70+
'host' => env('PAPERTRAIL_URL'),
71+
'port' => env('PAPERTRAIL_PORT'),
72+
),
73+
),
74+
75+
'stderr' => array(
76+
'driver' => 'errorlog',
77+
'handler' => StreamHandler::class,
78+
'formatter' => env('LOG_STDERR_FORMATTER'),
79+
'with' => array(
80+
'stream' => 'php://stderr',
81+
),
82+
),
83+
84+
'syslog' => array(
85+
'driver' => 'errorlog',
86+
'level' => env('LOG_LEVEL', 'debug'),
87+
),
88+
89+
'errorlog' => array(
90+
'driver' => 'errorlog',
91+
'level' => env('LOG_LEVEL', 'debug'),
92+
),
93+
94+
'null' => array(
95+
'driver' => 'errorlog',
96+
'handler' => NullHandler::class,
97+
),
98+
99+
'emergency' => array(
100+
'path' => storage_path('logs/laravel.log'),
101+
),
102+
),
103103

104104
);

database/migrations/2014_10_12_000000_create_users_table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function up()
2525
}
2626

2727
/**
28-
* Reverse the migrations.
28+
* Reverse the migrations...
2929
*
3030
* @return void
3131
*/

phpcs.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0"?>
2+
<ruleset name="PHP_CodeSniffer">
3+
<description>The coding standard for our project.</description>
4+
<rule ref="PSR2"/>
5+
6+
<file>app</file>
7+
<file>bootstrap</file>
8+
<file>config</file>
9+
<file>database</file>
10+
<file>resources</file>
11+
<file>routes</file>
12+
<file>tests</file>
13+
14+
<exclude-pattern>bootstrap/cache/*</exclude-pattern>
15+
<exclude-pattern>bootstrap/autoload.php</exclude-pattern>
16+
<exclude-pattern>*/migrations/*</exclude-pattern>
17+
<exclude-pattern>*/seeds/*</exclude-pattern>
18+
<exclude-pattern>*.blade.php</exclude-pattern>
19+
<exclude-pattern>*.js</exclude-pattern>
20+
21+
<!-- Show progression -->
22+
<arg value="p"/>
23+
</ruleset>

resources/views/welcome.blade.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@
2626
@endif
2727

2828
<div id="app">
29-
Vue 3 testing ...
30-
<test-component foo="bar"></test-component>
31-
End testing ..
29+
30+
<test-component foo="bar1"></test-component>
31+
<new-component foo="bar2"></new-component>
32+
3233
<div class="text-white bg-black">White text</div>
3334
</div>
3435

0 commit comments

Comments
 (0)