Permalink
Browse files

Upgrade to Laravel 4.1

  • Loading branch information...
1 parent 6dcde29 commit 3f017e69ea7d98126eae17b897de7816acaf8679 David Collinson committed Jan 23, 2014
Showing with 457 additions and 746 deletions.
  1. +4 −12 app/config/app.php.sample
  2. +4 −0 app/config/queue.php
  3. +59 −0 app/config/remote.php
  4. +2 −0 app/config/session.php
  5. +1 −1 app/config/view.php
  6. +2 −2 app/start/global.php
  7. +2 −2 artisan
  8. +0 −2 bootstrap/start.php
  9. +3 −3 composer.json
  10. +378 −709 composer.lock
  11. +2 −15 public/index.php
@@ -95,37 +95,29 @@ return array(
'Illuminate\Foundation\Providers\ArtisanServiceProvider',
'Illuminate\Auth\AuthServiceProvider',
'Illuminate\Cache\CacheServiceProvider',
- 'Illuminate\Foundation\Providers\CommandCreatorServiceProvider',
'Illuminate\Session\CommandsServiceProvider',
- 'Illuminate\Foundation\Providers\ComposerServiceProvider',
+ 'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',
'Illuminate\Routing\ControllerServiceProvider',
'Illuminate\Cookie\CookieServiceProvider',
'Illuminate\Database\DatabaseServiceProvider',
'Illuminate\Encryption\EncryptionServiceProvider',
'Illuminate\Filesystem\FilesystemServiceProvider',
'Illuminate\Hashing\HashServiceProvider',
'Illuminate\Html\HtmlServiceProvider',
- 'Illuminate\Foundation\Providers\KeyGeneratorServiceProvider',
'Illuminate\Log\LogServiceProvider',
'Illuminate\Mail\MailServiceProvider',
- 'Illuminate\Foundation\Providers\MaintenanceServiceProvider',
'Illuminate\Database\MigrationServiceProvider',
- 'Illuminate\Foundation\Providers\OptimizeServiceProvider',
'Illuminate\Pagination\PaginationServiceProvider',
- 'Illuminate\Foundation\Providers\PublisherServiceProvider',
'Illuminate\Queue\QueueServiceProvider',
'Illuminate\Redis\RedisServiceProvider',
+ 'Illuminate\Remote\RemoteServiceProvider',
'Illuminate\Auth\Reminders\ReminderServiceProvider',
- 'Illuminate\Foundation\Providers\RouteListServiceProvider',
'Illuminate\Database\SeedServiceProvider',
- 'Illuminate\Foundation\Providers\ServerServiceProvider',
'Illuminate\Session\SessionServiceProvider',
- 'Illuminate\Foundation\Providers\TinkerServiceProvider',
'Illuminate\Translation\TranslationServiceProvider',
'Illuminate\Validation\ValidationServiceProvider',
'Illuminate\View\ViewServiceProvider',
'Illuminate\Workbench\WorkbenchServiceProvider',
- 'Cartalyst\Sentry\SentryServiceProvider',
),
/*
@@ -161,7 +153,7 @@ return array(
'Cache' => 'Illuminate\Support\Facades\Cache',
'ClassLoader' => 'Illuminate\Support\ClassLoader',
'Config' => 'Illuminate\Support\Facades\Config',
- 'Controller' => 'Illuminate\Routing\Controllers\Controller',
+ 'Controller' => 'Illuminate\Routing\Controller',
'Cookie' => 'Illuminate\Support\Facades\Cookie',
'Crypt' => 'Illuminate\Support\Facades\Crypt',
'DB' => 'Illuminate\Support\Facades\DB',
@@ -186,11 +178,11 @@ return array(
'Schema' => 'Illuminate\Support\Facades\Schema',
'Seeder' => 'Illuminate\Database\Seeder',
'Session' => 'Illuminate\Support\Facades\Session',
+ 'SSH' => 'Illuminate\Support\Facades\SSH',
'Str' => 'Illuminate\Support\Str',
'URL' => 'Illuminate\Support\Facades\URL',
'Validator' => 'Illuminate\Support\Facades\Validator',
'View' => 'Illuminate\Support\Facades\View',
- 'Sentry' => 'Cartalyst\Sentry\Facades\Laravel\Sentry',
),
@@ -57,4 +57,8 @@
),
+ 'failed' => array(
+ 'database' => 'mysql', 'table' => 'failed_jobs',
+ ),
+
);
View
@@ -0,0 +1,59 @@
+<?php
+
+return array(
+
+ /*
+ |--------------------------------------------------------------------------
+ | Default Remote Connection Name
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify the default connection that will be used for SSH
+ | operations. This name should correspond to a connection name below
+ | in the server list. Each connection will be manually accessible.
+ |
+ */
+
+ 'default' => 'production',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Remote Server Connections
+ |--------------------------------------------------------------------------
+ |
+ | These are the servers that will be accessible via the SSH task runner
+ | facilities of Laravel. This feature radically simplifies executing
+ | tasks on your servers, such as deploying out these applications.
+ |
+ */
+
+ 'connections' => array(
+
+ 'production' => array(
+ 'host' => '',
+ 'username' => '',
+ 'password' => '',
+ 'key' => '',
+ 'keyphrase' => '',
+ 'root' => '/var/www',
+ ),
+
+ ),
+
+ /*
+ |--------------------------------------------------------------------------
+ | Remote Server Groups
+ |--------------------------------------------------------------------------
+ |
+ | Here you may list connections under a single group name, which allows
+ | you to easily access all of the servers at once using a short name
+ | that is extremely easy to remember, such as "web" or "database".
+ |
+ */
+
+ 'groups' => array(
+
+ 'web' => array('production')
+
+ ),
+
+);
@@ -29,6 +29,8 @@
|
*/
+ 'expire_on_close' => false,
+
'lifetime' => 10080,
/*
View
@@ -26,6 +26,6 @@
|
*/
- 'pagination' => 'pagination::slider',
+ 'pagination' => 'pagination::slider-3',
);
@@ -31,7 +31,7 @@
|
*/
-$logFile = 'log-'.php_sapi_name().'.txt';
+$logFile = 'laravel.log';
Log::useDailyFiles(storage_path().'/logs/'.$logFile);
@@ -101,4 +101,4 @@
|
*/
-require app_path().'/filters.php';
+require app_path().'/filters.php';
View
@@ -29,8 +29,6 @@ require __DIR__.'/bootstrap/autoload.php';
$app = require_once __DIR__.'/bootstrap/start.php';
-$app->boot();
-
/*
|--------------------------------------------------------------------------
| Load The Artisan Console Application
@@ -43,6 +41,8 @@ $app->boot();
|
*/
+$app->setRequestForConsoleEnvironment();
+
$artisan = Illuminate\Console\Application::start($app);
/*
View
@@ -13,8 +13,6 @@
$app = new Illuminate\Foundation\Application;
-$app->redirectIfTrailingSlash();
-
/*
|--------------------------------------------------------------------------
| Detect The Application Environment
View
@@ -3,9 +3,9 @@
"description": "The Laravel Framework.",
"keywords": ["framework", "laravel"],
"require": {
- "laravel/framework": "4.0.*",
- "cartalyst/sentry": "2.0.*",
- "raven/raven": "0.7.1"
+ "laravel/framework": "4.1.*",
+ "raven/raven": "0.7.1",
+ "loic-sharma/profiler": "dev-master"
},
"autoload": {
"classmap": [
Oops, something went wrong.

0 comments on commit 3f017e6

Please sign in to comment.