Skip to content

Commit 2d47dc1

Browse files
committed
Initial push for 4.1 laravel
1 parent 8b8e764 commit 2d47dc1

File tree

12 files changed

+109
-34
lines changed

12 files changed

+109
-34
lines changed

app/config/app.php

100755100644
+3-1
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
'Illuminate\Validation\ValidationServiceProvider',
206206
'Illuminate\View\ViewServiceProvider',
207207
'Illuminate\Workbench\WorkbenchServiceProvider',
208+
'Illuminate\Remote\RemoteServiceProvider',
208209
'Way\Generators\GeneratorsServiceProvider',
209210
'Juy\Profiler\Providers\ProfilerServiceProvider',
210211
'Intervention\Image\ImageServiceProvider',
@@ -244,7 +245,7 @@
244245
'Cache' => 'Illuminate\Support\Facades\Cache',
245246
'ClassLoader' => 'Illuminate\Support\ClassLoader',
246247
'Config' => 'Illuminate\Support\Facades\Config',
247-
'Controller' => 'Illuminate\Routing\Controllers\Controller',
248+
'Controller' => 'Illuminate\Routing\Controller',
248249
'Cookie' => 'Illuminate\Support\Facades\Cookie',
249250
'Crypt' => 'Illuminate\Support\Facades\Crypt',
250251
'DB' => 'Illuminate\Support\Facades\DB',
@@ -268,6 +269,7 @@
268269
'Schema' => 'Illuminate\Support\Facades\Schema',
269270
'Seeder' => 'Illuminate\Database\Seeder',
270271
'Session' => 'Illuminate\Support\Facades\Session',
272+
'SSH' => 'Illuminate\Support\Facades\SSH',
271273
'Str' => 'Illuminate\Support\Str',
272274
'URL' => 'Illuminate\Support\Facades\URL',
273275
'View' => 'Core\View\ViewFacade',

app/config/database.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111

112112
'redis' => array(
113113

114-
'cluster' => true,
114+
'cluster' => false,
115115

116116
'default' => array(
117117
'host' => '127.0.0.1',

app/config/queue.php

+22
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,28 @@
5555
'queue' => 'your-queue-name',
5656
),
5757

58+
'redis' => array(
59+
'driver' => 'redis',
60+
'queue' => 'default',
61+
),
62+
63+
),
64+
65+
/*
66+
|--------------------------------------------------------------------------
67+
| Failed Queue Jobs
68+
|--------------------------------------------------------------------------
69+
|
70+
| These options configure the behavior of failed queue job logging so you
71+
| can control which database and table are used to store the jobs that
72+
| have failed. You may change them to any database / table you wish.
73+
|
74+
*/
75+
76+
'failed' => array(
77+
78+
'database' => 'mysql', 'table' => 'failed_jobs',
79+
5880
),
5981

6082
);

app/config/remote.php

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?php
2+
3+
return array(
4+
5+
/*
6+
|--------------------------------------------------------------------------
7+
| Default Remote Connection Name
8+
|--------------------------------------------------------------------------
9+
|
10+
| Here you may specify the default connection that will be used for SSH
11+
| operations. This name should correspond to a connection name below
12+
| in the server list. Each connection will be manually accessible.
13+
|
14+
*/
15+
16+
'default' => 'production',
17+
18+
/*
19+
|--------------------------------------------------------------------------
20+
| Remote Server Connections
21+
|--------------------------------------------------------------------------
22+
|
23+
| These are the servers that will be accessible via the SSH task runner
24+
| facilities of Laravel. This feature radically simplifies executing
25+
| tasks on your servers, such as deploying out these applications.
26+
|
27+
*/
28+
29+
'connections' => array(
30+
31+
'production' => array(
32+
'host' => '',
33+
'username' => '',
34+
'password' => '',
35+
'key' => '',
36+
'keyphrase' => '',
37+
'root' => '/var/www',
38+
),
39+
40+
),
41+
42+
/*
43+
|--------------------------------------------------------------------------
44+
| Remote Server Groups
45+
|--------------------------------------------------------------------------
46+
|
47+
| Here you may list connections under a single group name, which allows
48+
| you to easily access all of the servers at once using a short name
49+
| that is extremely easy to remember, such as "web" or "database".
50+
|
51+
*/
52+
53+
'groups' => array(
54+
55+
'web' => array('production')
56+
57+
),
58+
59+
);

app/config/session.php

+9-7
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
*/
3030

3131
'lifetime' => 5184000,
32+
'expire_on_close' => false,
3233

3334
/*
3435
|--------------------------------------------------------------------------
@@ -120,17 +121,18 @@
120121
*/
121122

122123
'domain' => null,
123-
124124
/*
125125
|--------------------------------------------------------------------------
126-
| Session Payload Cookie Name
126+
| HTTPS Only Cookies
127127
|--------------------------------------------------------------------------
128128
|
129-
| When using the "cookie" session driver, you may configure the name of
130-
| the cookie used as the session "payload". This cookie actually has
131-
| the encrypted session data stored within it for the application.
129+
| By setting this option to true, session cookies will only be sent back
130+
| to the server if the browser has a HTTPS connection. This will keep
131+
| the cookie from being sent to you if it can not be done securely.
132132
|
133133
*/
134134

135-
'payload' => 'laravel_payload',
136-
);
135+
'secure' => false,
136+
137+
138+
);

app/core

Submodule core updated from d66ee42 to 3369aa7

app/lang/en/reminders.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
|
1414
*/
1515

16-
"password" => "Passwords must be six characters and match the confirmation.",
16+
"password" => "Passwords must be at least six characters and match the confirmation.",
1717

18-
"user" => "We can't find a user with that e-mail address.",
18+
"user" => "We can't find a user with that e-mail address.",
1919

20-
"token" => "This password reset token is invalid.",
20+
"token" => "This password reset token is invalid.",
2121

22-
);
22+
"sent" => "Password reminder sent!",
23+
24+
);

app/start/artisan.php

+2
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@
1111
|
1212
*/
1313

14+
Artisan::add(new UpgradeCommand);
15+
Artisan::resolve('UpgradeCommand');

artisan

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ require __DIR__.'/bootstrap/autoload.php';
2929

3030
$app = require_once __DIR__.'/bootstrap/start.php';
3131

32-
$app->boot();
33-
3432
/*
3533
|--------------------------------------------------------------------------
3634
| Load The Artisan Console Application
@@ -43,6 +41,8 @@ $app->boot();
4341
|
4442
*/
4543

44+
$app->setRequestForConsoleEnvironment();
45+
4646
$artisan = Illuminate\Console\Application::start($app);
4747

4848
/*

bootstrap/start.php

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
$app = new Illuminate\Foundation\Application;
1515

16-
$app->redirectIfTrailingSlash();
1716

1817
/*
1918
|--------------------------------------------------------------------------

composer.json

100755100644
+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"name": "laravel/laravel",
33
"description": "The Laravel Framework.",
44
"keywords": ["framework", "laravel"],
5+
"license": "MIT",
56
"require": {
6-
"laravel/framework": "4.0.*",
7-
"awareness/aware": "dev-master",
7+
"laravel/framework": "4.1.*",
88
"way/generators": "dev-master",
99
"wisembly/elephant.io": "dev-master",
1010
"juy/profiler" : "dev-master",
@@ -19,6 +19,7 @@
1919
"app/library",
2020
"app/models",
2121
"app/core",
22+
"app/core/commands",
2223
"app/core/controllers",
2324
"app/core/library",
2425
"app/core/models",
@@ -27,7 +28,6 @@
2728
"app/tests/TestCase.php"
2829
],
2930
"psr-0": {
30-
"Awareness": "./src/",
3131
"Core": "app/"
3232
}
3333
},

public/index.php

+1-14
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,8 @@
4242
| Once we have the application, we can simply call the run method,
4343
| which will execute the request and send the response back to
4444
| the client's browser allowing them to enjoy the creative
45-
| and wonderful applications we have created for them.
45+
| and wonderful application we have whipped up for them.
4646
|
4747
*/
4848

4949
$app->run();
50-
51-
/*
52-
|--------------------------------------------------------------------------
53-
| Shutdown The Application
54-
|--------------------------------------------------------------------------
55-
|
56-
| Once the app has finished running, we will fire off the shutdown events
57-
| so that any final work may be done by the application before we shut
58-
| down the process. This is the last thing to happen to the request.
59-
|
60-
*/
61-
62-
$app->shutdown();

0 commit comments

Comments
 (0)