Skip to content

Commit 7ecde8f

Browse files
committed
Merge pull request laravel#1265 from taiyaei/fix-indentation
Standarize indentation to tabs instead of mixture.
2 parents 5690847 + e78a390 commit 7ecde8f

11 files changed

+102
-102
lines changed

authentication.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ The `intended` redirect function will redirect the user to the URL they were att
7070

7171
You also may add extra conditions to the authentication query:
7272

73-
if (Auth::attempt(['email' => $email, 'password' => $password, 'active' => 1]))
74-
{
75-
// The user is active, not suspended, and exists.
76-
}
73+
if (Auth::attempt(['email' => $email, 'password' => $password, 'active' => 1]))
74+
{
75+
// The user is active, not suspended, and exists.
76+
}
7777

7878
#### Determining If A User Is Authenticated
7979

configuration.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ If the `.htaccess` file that ships with Laravel does not work with your Apache i
139139

140140
On Nginx, the following directive in your site configuration will allow "pretty" URLs:
141141

142-
location / {
143-
try_files $uri $uri/ /index.php?$query_string;
144-
}
142+
location / {
143+
try_files $uri $uri/ /index.php?$query_string;
144+
}
145145

146146
Of course, when using [Homestead](/docs/5.0/homestead), pretty URLs will be configured automatically.

elixir.md

+48-48
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Next, you'll want to pull in [Gulp](http://gulpjs.com) as a global NPM package l
3737

3838
The only remaining step is to install Elixir! With a new install of Laravel, you'll find a `package.json` file in the root. Think of this like your `composer.json` file, except it defines Node dependencies instead of PHP. You may install the dependencies it references by running:
3939

40-
npm install
40+
npm install
4141

4242
<a name="usage"></a>
4343
## Usage
@@ -48,7 +48,7 @@ Now that you've installed Elixir, you'll be compiling and concatenating in no ti
4848

4949
```javascript
5050
elixir(function(mix) {
51-
mix.less("app.less");
51+
mix.less("app.less");
5252
});
5353
```
5454

@@ -58,18 +58,18 @@ In the example above, Elixir assumes that your Less files are stored in `resourc
5858

5959
```javascript
6060
elixir(function(mix) {
61-
mix.less([
62-
'app.less',
63-
'something-else.less'
64-
]);
61+
mix.less([
62+
'app.less',
63+
'something-else.less'
64+
]);
6565
});
6666
```
6767

6868
#### Compile Sass
6969

7070
```javascript
7171
elixir(function(mix) {
72-
mix.sass("app.sass");
72+
mix.sass("app.sass");
7373
});
7474
```
7575

@@ -79,7 +79,7 @@ By default, Elixir, underneath the hood, uses the LibSass library for compilatio
7979

8080
```javascript
8181
elixir(function(mix) {
82-
mix.rubySass("app.sass");
82+
mix.rubySass("app.sass");
8383
});
8484
```
8585

@@ -89,7 +89,7 @@ elixir(function(mix) {
8989
elixir.config.sourcemaps = false;
9090

9191
elixir(function(mix) {
92-
mix.sass("app.scss");
92+
mix.sass("app.scss");
9393
});
9494
```
9595

@@ -99,7 +99,7 @@ Source maps are enabled out of the box. As such, for each file that is compiled,
9999

100100
```javascript
101101
elixir(function(mix) {
102-
mix.coffee();
102+
mix.coffee();
103103
});
104104
```
105105

@@ -118,26 +118,26 @@ elixir(function(mix) {
118118

119119
```javascript
120120
elixir(function(mix) {
121-
mix.phpUnit();
121+
mix.phpUnit();
122122
});
123123
```
124124

125125
#### Trigger PHPSpec Tests
126126

127127
```javascript
128128
elixir(function(mix) {
129-
mix.phpSpec();
129+
mix.phpSpec();
130130
});
131131
```
132132

133133
#### Combine Stylesheets
134134

135135
```javascript
136136
elixir(function(mix) {
137-
mix.styles([
138-
"normalize.css",
139-
"main.css"
140-
]);
137+
mix.styles([
138+
"normalize.css",
139+
"main.css"
140+
]);
141141
});
142142
```
143143

@@ -147,21 +147,21 @@ Paths passed to this method are relative to the `resources/css` directory.
147147

148148
```javascript
149149
elixir(function(mix) {
150-
mix.styles([
151-
"normalize.css",
152-
"main.css"
153-
], 'public/build/css/everything.css');
150+
mix.styles([
151+
"normalize.css",
152+
"main.css"
153+
], 'public/build/css/everything.css');
154154
});
155155
```
156156

157157
#### Combine Stylesheets From A Custom Base Directory
158158

159159
```javascript
160160
elixir(function(mix) {
161-
mix.styles([
162-
"normalize.css",
163-
"main.css"
164-
], 'public/build/css/everything.css', 'public/css');
161+
mix.styles([
162+
"normalize.css",
163+
"main.css"
164+
], 'public/build/css/everything.css', 'public/css');
165165
});
166166
```
167167

@@ -171,18 +171,18 @@ The third argument to both the `styles` and `scripts` methods determines the rel
171171

172172
```javascript
173173
elixir(function(mix) {
174-
mix.stylesIn("public/css");
174+
mix.stylesIn("public/css");
175175
});
176176
```
177177

178178
#### Combine Scripts
179179

180180
```javascript
181181
elixir(function(mix) {
182-
mix.scripts([
183-
"jquery.js",
184-
"app.js"
185-
]);
182+
mix.scripts([
183+
"jquery.js",
184+
"app.js"
185+
]);
186186
});
187187
```
188188

@@ -192,7 +192,7 @@ Again, this assumes all paths are relative to the `resources/js` directory.
192192

193193
```javascript
194194
elixir(function(mix) {
195-
mix.scriptsIn("public/js/some/directory");
195+
mix.scriptsIn("public/js/some/directory");
196196
});
197197
```
198198

@@ -209,7 +209,7 @@ elixir(function(mix) {
209209

210210
```javascript
211211
elixir(function(mix) {
212-
mix.version("css/all.css");
212+
mix.version("css/all.css");
213213
});
214214
```
215215

@@ -227,7 +227,7 @@ You may also pass an array to the `version` method to version multiple files:
227227

228228
```javascript
229229
elixir(function(mix) {
230-
mix.version(["css/all.css", "js/app.js"]);
230+
mix.version(["css/all.css", "js/app.js"]);
231231
});
232232
```
233233

@@ -240,15 +240,15 @@ elixir(function(mix) {
240240

241241
```javascript
242242
elixir(function(mix) {
243-
mix.copy('vendor/foo/bar.css', 'public/css/bar.css');
243+
mix.copy('vendor/foo/bar.css', 'public/css/bar.css');
244244
});
245245
```
246246

247247
#### Copy an Entire Directory to a New Location
248248

249249
```javascript
250250
elixir(function(mix) {
251-
mix.copy('vendor/package/views', 'resources/views');
251+
mix.copy('vendor/package/views', 'resources/views');
252252
});
253253
```
254254

@@ -272,23 +272,23 @@ Now that you've told Elixir which tasks to execute, you only need to trigger Gul
272272

273273
#### Execute All Registered Tasks Once
274274

275-
gulp
275+
gulp
276276

277277
#### Watch Assets For Changes
278278

279-
gulp watch
279+
gulp watch
280280

281281
#### Only Compile Scripts
282282

283-
gulp scripts
283+
gulp scripts
284284

285285
#### Only Compile Styles
286286

287-
gulp styles
287+
gulp styles
288288

289289
#### Watch Tests And PHP Classes for Changes
290290

291-
gulp tdd
291+
gulp tdd
292292

293293
> **Note:** All tasks will assume a development environment, and will exclude minification. For production, use `gulp --production`.
294294
@@ -299,17 +299,17 @@ You can even create your own Gulp tasks, and hook them into Elixir. Imagine that
299299
uses the Terminal to verbally notify you with some message. Here's what that might look like:
300300

301301
```javascript
302-
var gulp = require("gulp");
303-
var shell = require("gulp-shell");
304-
var elixir = require("laravel-elixir");
302+
var gulp = require("gulp");
303+
var shell = require("gulp-shell");
304+
var elixir = require("laravel-elixir");
305305

306-
elixir.extend("message", function(message) {
306+
elixir.extend("message", function(message) {
307307

308-
gulp.task("say", function() {
309-
gulp.src("").pipe(shell("say " + message));
310-
});
308+
gulp.task("say", function() {
309+
gulp.src("").pipe(shell("say " + message));
310+
});
311311

312-
return this.queueTask("say");
312+
return this.queueTask("say");
313313

314314
});
315315
```
@@ -334,7 +334,7 @@ You're done! Now, you can mix it in.
334334

335335
```javascript
336336
elixir(function(mix) {
337-
mix.message("Tea, Earl Grey, Hot");
337+
mix.message("Tea, Earl Grey, Hot");
338338
});
339339
```
340340

eloquent.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1304,10 +1304,10 @@ When you pass a model to the `route` or `action` methods, it's primary key is in
13041304

13051305
In this example the `$user->id` property will be inserted into the `{user}` place-holder of the generated URL. However, if you would like to use another property instead of the ID, you may override the `getRouteKey` method on your model:
13061306

1307-
public function getRouteKey()
1308-
{
1309-
return $this->slug;
1310-
}
1307+
public function getRouteKey()
1308+
{
1309+
return $this->slug;
1310+
}
13111311

13121312
<a name="converting-to-arrays-or-json"></a>
13131313
## Converting To Arrays / JSON

installation.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ If the `.htaccess` file that ships with Laravel does not work with your Apache i
8787

8888
On Nginx, the following directive in your site configuration will allow "pretty" URLs:
8989

90-
location / {
91-
try_files $uri $uri/ /index.php?$query_string;
92-
}
90+
location / {
91+
try_files $uri $uri/ /index.php?$query_string;
92+
}
9393

9494
Of course, when using [Homestead](/docs/5.0/homestead), pretty URLs will be configured automatically.

routing.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Laravel automatically generates a CSRF "token" for each active user session mana
6565

6666
#### Insert The CSRF Token Into A Form
6767

68-
<input type="hidden" name="_token" value="<?php echo csrf_token(); ?>">
68+
<input type="hidden" name="_token" value="<?php echo csrf_token(); ?>">
6969

7070
Of course, using the Blade [templating engine](/docs/5.0/templates):
7171

@@ -80,10 +80,10 @@ In addition to looking for the CSRF token as a "POST" parameter, the middleware
8080
<meta name="csrf-token" content="{{ csrf_token() }}" />
8181

8282
$.ajaxSetup({
83-
headers: {
84-
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
85-
}
86-
});
83+
headers: {
84+
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
85+
}
86+
});
8787

8888
Now all AJAX requests will automatically include the CSRF token:
8989

@@ -106,8 +106,8 @@ The value sent with the `_method` field will be used as the HTTP request method.
106106

107107
<form action="/foo/bar" method="POST">
108108
<input type="hidden" name="_method" value="PUT">
109-
<input type="hidden" name="_token" value="<?php echo csrf_token(); ?>">
110-
</form>
109+
<input type="hidden" name="_token" value="<?php echo csrf_token(); ?>">
110+
</form>
111111

112112
<a name="route-parameters"></a>
113113
## Route Parameters
@@ -204,7 +204,7 @@ Named routes allow you to conveniently generate URLs or redirects for a specific
204204
You may also specify route names for controller actions:
205205

206206
Route::get('user/profile', [
207-
'as' => 'profile', 'uses' => 'UserController@showProfile'
207+
'as' => 'profile', 'uses' => 'UserController@showProfile'
208208
]);
209209

210210
Now, you may use the route's name when generating URLs or redirects:

schema.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ Command | Description
231231

232232
To set the storage engine for a table, set the `engine` property on the schema builder:
233233

234-
Schema::create('users', function($table)
235-
{
236-
$table->engine = 'InnoDB';
234+
Schema::create('users', function($table)
235+
{
236+
$table->engine = 'InnoDB';
237237

238-
$table->string('email');
239-
});
238+
$table->string('email');
239+
});

templates.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ If you don't want the data to be escaped, you may use the following syntax:
101101
@endforeach
102102

103103
@forelse($users as $user)
104-
<li>{{ $user->name }}</li>
104+
<li>{{ $user->name }}</li>
105105
@empty
106-
<p>No users</p>
106+
<p>No users</p>
107107
@endforelse
108108

109109
@while (true)

0 commit comments

Comments
 (0)