Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Laravel upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaron Kuzemchak committed Mar 29, 2013
1 parent 927fc71 commit 613db20
Show file tree
Hide file tree
Showing 19 changed files with 216 additions and 36 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
.DS_Store

# Composer
/vendor
/vendor
/bootstrap/compiled.php
17 changes: 11 additions & 6 deletions app/config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@

/*
|--------------------------------------------------------------------------
| Application Fallback Locale
| Routable Locales
|--------------------------------------------------------------------------
|
| The fallback locale determines the locale to use when the current one
| is not available. You may change the value to correspond to any of
| the language folders that are provided through your application.
| Here you may list the locales that are "routable" for your application.
| When a request with a URI beginning with one of the locales is sent
| to the application, the "default" locale will be set accordingly.
|
*/

'fallback_locale' => 'en',
'locales' => array(),

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -92,15 +92,18 @@
'Illuminate\Encryption\EncryptionServiceProvider',
'Illuminate\Filesystem\FilesystemServiceProvider',
'Illuminate\Hashing\HashServiceProvider',
'Illuminate\Html\HtmlServiceProvider',
'Illuminate\Foundation\Providers\KeyGeneratorServiceProvider',
'Illuminate\Log\LogServiceProvider',
'Illuminate\Mail\MailServiceProvider',
'Illuminate\Database\MigrationServiceProvider',
'Illuminate\Foundation\Providers\OptimizeServiceProvider',
'Illuminate\Pagination\PaginationServiceProvider',
'Illuminate\Foundation\Providers\PublisherServiceProvider',
'Illuminate\Queue\QueueServiceProvider',
'Illuminate\Redis\RedisServiceProvider',
'Illuminate\Auth\Reminders\ReminderServiceProvider',
'Illuminate\Foundation\Providers\RouteListServiceProvider',
'Illuminate\Database\SeedServiceProvider',
'Illuminate\Foundation\Providers\ServerServiceProvider',
'Illuminate\Session\SessionServiceProvider',
Expand All @@ -123,7 +126,7 @@
|
*/

'manifest' => __DIR__.'/../storage/meta',
'manifest' => storage_path().'/meta',

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -152,7 +155,9 @@
'Eloquent' => 'Illuminate\Database\Eloquent\Model',
'Event' => 'Illuminate\Support\Facades\Event',
'File' => 'Illuminate\Support\Facades\File',
'Form' => 'Illuminate\Support\Facades\Form',
'Hash' => 'Illuminate\Support\Facades\Hash',
'Html' => 'Illuminate\Support\Facades\Html',
'Input' => 'Illuminate\Support\Facades\Input',
'Lang' => 'Illuminate\Support\Facades\Lang',
'Log' => 'Illuminate\Support\Facades\Log',
Expand Down
2 changes: 1 addition & 1 deletion app/config/cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
|
*/

'path' => __DIR__.'/../storage/cache',
'path' => storage_path().'/cache',

/*
|--------------------------------------------------------------------------
Expand Down
18 changes: 18 additions & 0 deletions app/config/compile.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

return array(

/*
|--------------------------------------------------------------------------
| Additional Compiled Classes
|--------------------------------------------------------------------------
|
| Here you may specify additional classes to include in the compiled file
| generated by the `artisan optimize` command. These should be classes
| that are included on basically every request into the application.
|
*/



);
4 changes: 2 additions & 2 deletions app/config/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
'password' => '',
'charset' => 'utf8',
'prefix' => '',
'schema' => 'public',
'schema' => 'public',
),

'sqlsrv' => array(
Expand Down Expand Up @@ -119,4 +119,4 @@

),

);
);
19 changes: 17 additions & 2 deletions app/config/mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@

return array(

/*
|--------------------------------------------------------------------------
| Mail Driver
|--------------------------------------------------------------------------
|
| Laravel supports both SMTP and PHP's "mail" function as drivers for the
| sending of e-mail. You may specify which one you're using throughout
| your application here. By default, Laravel is setup for SMTP mail.
|
| Supported: "smtp", "mail"
|
*/

'driver' => 'smtp',

/*
|--------------------------------------------------------------------------
| SMTP Host Address
Expand All @@ -13,7 +28,7 @@
|
*/

'host' => 'smtp.postmarkapp.com',
'host' => 'smtp.mailgun.org',

/*
|--------------------------------------------------------------------------
Expand All @@ -26,7 +41,7 @@
|
*/

'port' => 2525,
'port' => 587,

/*
|--------------------------------------------------------------------------
Expand Down
13 changes: 10 additions & 3 deletions app/config/queue.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
| API, giving you convenient access to each back-end using the same
| syntax for each one. Here you may set the default queue driver.
|
| Supported: "sync", "beanstalkd"
| Supported: "sync", "beanstalkd", "sqs", "iron"
|
*/

'default' => 'sqs',
'default' => 'sync',

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -48,6 +48,13 @@
'region' => 'us-east-1',
),

'iron' => array(
'driver' => 'iron',
'project' => 'your-project-id',
'token' => 'your-token',
'queue' => 'your-queue-name',
),

),

);
);
43 changes: 41 additions & 2 deletions app/config/session.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
| requests. By default we will use the light-weight cookie driver but
| you may specify any of the other wonderful drivers provided here.
|
| Supported: "cookie", file", "database", "apc",
| Supported: "cookie", "file", "database", "apc",
| "memcached", "redis", "array"
|
*/
Expand Down Expand Up @@ -42,7 +42,7 @@
|
*/

'path' => __DIR__.'/../storage/sessions',
'files' => storage_path().'/sessions',

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -96,4 +96,43 @@

'cookie' => 'laravel_session',

/*
|--------------------------------------------------------------------------
| Session Cookie Path
|--------------------------------------------------------------------------
|
| The session cookie path determines the path for which the cookie will
| be regarded as available. Typically, this will be the root path of
| your application but you are free to change this when necessary.
|
*/

'path' => '/',

/*
|--------------------------------------------------------------------------
| Session Cookie Domain
|--------------------------------------------------------------------------
|
| Here you may change the domain of the cookie used to identify a session
| in your application. This will determine which domains the cookie is
| available to in your application. A sensible default has been set.
|
*/

'domain' => null,

/*
|--------------------------------------------------------------------------
| Session Payload Cookie Name
|--------------------------------------------------------------------------
|
| When using the "cookie" session driver, you may configure the name of
| the cookie used as the session "payload". This cookie actually has
| the encrypted session data stored within it for the application.
|
*/

'payload' => 'laravel_payload',

);
31 changes: 31 additions & 0 deletions app/config/workbench.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php

return array(

/*
|--------------------------------------------------------------------------
| Workbench Author Name
|--------------------------------------------------------------------------
|
| When you create new packages via the Artisan "workbench" command your
| name is needed to generate the composer.json file for your package.
| You may specify it now so it is used for all of your workbenches.
|
*/

'name' => '',

/*
|--------------------------------------------------------------------------
| Workbench Author E-Mail Address
|--------------------------------------------------------------------------
|
| Like the option above, your e-mail address is used when generating new
| workbench packages. The e-mail is placed in your composer.json file
| automatically whwen the package is created by the workbench tool.
|
*/

'email' => '',

);
4 changes: 2 additions & 2 deletions app/filters.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

Route::filter('csrf', function()
{
if (Session::getToken() != Input::get('csrf_token'))
if (Session::getToken() != Input::get('_token'))
{
throw new Illuminate\Session\TokenMismatchException;
}
Expand Down Expand Up @@ -104,4 +104,4 @@
{
App::abort(403, 'Hourly request limit exceeded');
}
});
});
5 changes: 3 additions & 2 deletions app/start/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

ClassLoader::addDirectories(array(

app_path().'/commands',
app_path().'/controllers',
app_path().'/models',
app_path().'/database/seeds',
Expand All @@ -32,7 +33,7 @@

$logFile = 'log-'.php_sapi_name().'.txt';

Log::useDailyFiles(__DIR__.'/../storage/logs/'.$logFile);
Log::useDailyFiles(storage_path().'/logs/'.$logFile);

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -69,4 +70,4 @@
|
*/

require __DIR__.'/../events.php';
require __DIR__.'/../events.php';
22 changes: 11 additions & 11 deletions app/tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

class TestCase extends Illuminate\Foundation\Testing\TestCase {

/**
* Creates the application.
*
* @return Symfony\Component\HttpKernel\HttpKernelInterface
*/
public function createApplication()
{
$unitTesting = true;
/**
* Creates the application.
*
* @return Symfony\Component\HttpKernel\HttpKernelInterface
*/
public function createApplication()
{
$unitTesting = true;

$testEnvironment = 'testing';
$testEnvironment = 'testing';

return require __DIR__.'/../../bootstrap/start.php';
}
return require __DIR__.'/../../bootstrap/start.php';
}

}
17 changes: 16 additions & 1 deletion artisan
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,19 @@ $artisan = Illuminate\Console\Application::start($app);
|
*/

$artisan->run();
$status = $artisan->run();

/*
|--------------------------------------------------------------------------
| Shutdown The Application
|--------------------------------------------------------------------------
|
| Once Artisan has finished running. We will fire off the shutdown events
| so that any final work may be done by the application before we shut
| down the process. This is the last thing to happen to the request.
|
*/

$app->shutdown();

exit($status);
Loading

0 comments on commit 613db20

Please sign in to comment.