Skip to content

Commit 27a393a

Browse files
author
Pedro Fernandes Steimbruch
committed
Refs #17122 fixing editconfig and indentation
1 parent 5dc92dc commit 27a393a

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

.editorconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
root = true
55

66
[*]
7-
indent_style = space
7+
indent_style = tab
88
indent_size = 4
99
end_of_line = lf
1010
insert_final_newline = true
@@ -14,5 +14,5 @@ trim_trailing_whitespace = true
1414
end_of_line = crlf
1515

1616
[*.yml]
17-
indent_style = space
17+
indent_style = tab
1818
indent_size = 2

config/bootstrap.php

+30-30
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
// You can remove this if you are confident you have intl installed.
3737
if (!extension_loaded('intl')) {
38-
trigger_error('You must enable the intl extension to use CakePHP.', E_USER_ERROR);
38+
trigger_error('You must enable the intl extension to use CakePHP.', E_USER_ERROR);
3939
}
4040

4141
use Cake\Cache\Cache;
@@ -63,10 +63,10 @@
6363
* that changes from configuration that does not. This makes deployment simpler.
6464
*/
6565
try {
66-
Configure::config('default', new PhpConfig());
67-
Configure::load('app', 'default', false);
66+
Configure::config('default', new PhpConfig());
67+
Configure::load('app', 'default', false);
6868
} catch (\Exception $e) {
69-
exit($e->getMessage() . "\n");
69+
exit($e->getMessage() . "\n");
7070
}
7171

7272
// Load an environment local configuration file.
@@ -78,8 +78,8 @@
7878
// for a very very long time, as we don't want
7979
// to refresh the cache while users are doing requests.
8080
if (!Configure::read('debug')) {
81-
Configure::write('Cache._cake_model_.duration', '+1 years');
82-
Configure::write('Cache._cake_core_.duration', '+1 years');
81+
Configure::write('Cache._cake_model_.duration', '+1 years');
82+
Configure::write('Cache._cake_core_.duration', '+1 years');
8383
}
8484

8585
/**
@@ -104,14 +104,14 @@
104104
*/
105105
$isCli = PHP_SAPI === 'cli';
106106
if ($isCli) {
107-
(new ConsoleErrorHandler(Configure::read('Error')))->register();
107+
(new ConsoleErrorHandler(Configure::read('Error')))->register();
108108
} else {
109-
(new ErrorHandler(Configure::read('Error')))->register();
109+
(new ErrorHandler(Configure::read('Error')))->register();
110110
}
111111

112112
// Include the CLI bootstrap overrides.
113113
if ($isCli) {
114-
require __DIR__ . '/bootstrap_cli.php';
114+
require __DIR__ . '/bootstrap_cli.php';
115115
}
116116

117117
/**
@@ -121,16 +121,16 @@
121121
* If you define fullBaseUrl in your config file you can remove this.
122122
*/
123123
if (!Configure::read('App.fullBaseUrl')) {
124-
$s = null;
125-
if (env('HTTPS')) {
126-
$s = 's';
127-
}
128-
129-
$httpHost = env('HTTP_HOST');
130-
if (isset($httpHost)) {
131-
Configure::write('App.fullBaseUrl', 'http' . $s . '://' . $httpHost);
132-
}
133-
unset($httpHost, $s);
124+
$s = null;
125+
if (env('HTTPS')) {
126+
$s = 's';
127+
}
128+
129+
$httpHost = env('HTTP_HOST');
130+
if (isset($httpHost)) {
131+
Configure::write('App.fullBaseUrl', 'http' . $s . '://' . $httpHost);
132+
}
133+
unset($httpHost, $s);
134134
}
135135

136136
Cache::config(Configure::consume('Cache'));
@@ -151,12 +151,12 @@
151151
* Setup detectors for mobile and tablet.
152152
*/
153153
Request::addDetector('mobile', function ($request) {
154-
$detector = new \Detection\MobileDetect();
155-
return $detector->isMobile();
154+
$detector = new \Detection\MobileDetect();
155+
return $detector->isMobile();
156156
});
157157
Request::addDetector('tablet', function ($request) {
158-
$detector = new \Detection\MobileDetect();
159-
return $detector->isTablet();
158+
$detector = new \Detection\MobileDetect();
159+
return $detector->isTablet();
160160
});
161161

162162
/**
@@ -189,7 +189,7 @@
189189
// Only try to load DebugKit in development mode
190190
// Debug Kit should not be installed on a production system
191191
if (Configure::read('debug')) {
192-
Plugin::load('DebugKit', ['bootstrap' => true]);
192+
Plugin::load('DebugKit', ['bootstrap' => true]);
193193
}
194194

195195
/**
@@ -206,11 +206,11 @@
206206
* Also enable immutable time objects in the ORM.
207207
*/
208208
Type::build('time')
209-
->useImmutable()
210-
->useLocaleParser();
209+
->useImmutable()
210+
->useLocaleParser();
211211
Type::build('date')
212-
->useImmutable()
213-
->useLocaleParser();
212+
->useImmutable()
213+
->useLocaleParser();
214214
Type::build('datetime')
215-
->useImmutable()
216-
->useLocaleParser();
215+
->useImmutable()
216+
->useLocaleParser();

0 commit comments

Comments
 (0)