diff --git a/UPGRADE.md b/UPGRADE.md index a101c8b35..a315e2a52 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -42,8 +42,10 @@ Optional things you can delete, if they do not contain anything custom. [DELETE] /app/routes.php [DELETE] /app [DELETE] /storage/cache + [DELETE] /storage/combiner + [DELETE] /storage/twig -### Remmoved config +### Removed config cms.tempDir - use temp_path() @@ -55,11 +57,11 @@ Dispatcher functionality is now baked in to Laravel, check the Plugin registrati #### Removed PATH_* constants -PATH_APP - use app_path() -PATH_BASE - use base_path() -PATH_PUBLIC - use public_path() -PATH_STORAGE - use storage_path() -PATH_PLUGINS - use plugins_path() +- PATH_APP - use app_path() +- PATH_BASE - use base_path() +- PATH_PUBLIC - use public_path() +- PATH_STORAGE - use storage_path() +- PATH_PLUGINS - use plugins_path() #### Paginator / setCurrentPage @@ -86,6 +88,6 @@ The following methods have changed: ### Things to do -- Fix unit tests -- Dispatcher now native? -- Cron queue type now native? \ No newline at end of file +- Remove "Cron" package, drop + create relevant tables +- Implement registerSchedule() in PluginBase +- Fix unit tests \ No newline at end of file diff --git a/config/filesystems.php b/config/filesystems.php new file mode 100644 index 000000000..c636d36c3 --- /dev/null +++ b/config/filesystems.php @@ -0,0 +1,70 @@ + 'local', + + /* + |-------------------------------------------------------------------------- + | Default Cloud Filesystem Disk + |-------------------------------------------------------------------------- + | + | Many applications store files both locally and in the cloud. For this + | reason, you may specify a default "cloud" driver here. This driver + | will be bound as the Cloud disk implementation in the container. + | + */ + + 'cloud' => 's3', + + /* + |-------------------------------------------------------------------------- + | Filesystem Disks + |-------------------------------------------------------------------------- + | + | Here you may configure as many filesystem "disks" as you wish, and you + | may even configure multiple disks of the same driver. Defaults have + | been setup for each driver as an example of the required options. + | + */ + + 'disks' => [ + + 'local' => [ + 'driver' => 'local', + 'root' => storage_path().'/app', + ], + + 's3' => [ + 'driver' => 's3', + 'key' => 'your-key', + 'secret' => 'your-secret', + 'region' => 'your-region', + 'bucket' => 'your-bucket', + ], + + 'rackspace' => [ + 'driver' => 'rackspace', + 'username' => 'your-username', + 'key' => 'your-key', + 'container' => 'your-container', + 'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/', + 'region' => 'IAD', + ], + + ], + +]; diff --git a/config/mail.php b/config/mail.php index 7815a5b90..97ff44325 100644 --- a/config/mail.php +++ b/config/mail.php @@ -1,6 +1,6 @@ 'smtp', + 'driver' => 'mail', /* |-------------------------------------------------------------------------- @@ -24,7 +24,7 @@ return array( | | Here you may provide the host address of the SMTP server used by your | applications. A default option is provided that is compatible with - | the Postmark mail service, which will provide reliable delivery. + | the Mailgun mail service which will provide reliable deliveries. | */ @@ -35,9 +35,9 @@ return array( | SMTP Host Port |-------------------------------------------------------------------------- | - | This is the SMTP port used by your application to delivery e-mails to - | users of your application. Like the host we have set this value to - | stay compatible with the Postmark e-mail application by default. + | This is the SMTP port used by your application to deliver e-mails to + | users of the application. Like the host we have set this value to + | stay compatible with the Mailgun e-mail application by default. | */ @@ -54,7 +54,7 @@ return array( | */ - 'from' => array('address' => 'noreply@domain.tld', 'name' => 'OctoberCMS'), + 'from' => ['address' => 'noreply@domain.tld', 'name' => 'OctoberCMS'], /* |-------------------------------------------------------------------------- @@ -121,4 +121,4 @@ return array( 'pretend' => false, -); +]; \ No newline at end of file diff --git a/config/queue.php b/config/queue.php index 7e30a5364..cf7500ab2 100644 --- a/config/queue.php +++ b/config/queue.php @@ -1,6 +1,6 @@ 'cron', + 'default' => 'sync', /* |-------------------------------------------------------------------------- @@ -28,43 +29,50 @@ return array( | */ - 'connections' => array( + 'connections' => [ - 'cron' => array( - 'driver' => 'cron', - ), - - 'sync' => array( + 'sync' => [ 'driver' => 'sync', - ), + ], - 'beanstalkd' => array( + 'database' => [ + 'driver' => 'database', + 'table' => 'jobs', + 'queue' => 'default', + 'expire' => 60, + ], + + 'beanstalkd' => [ 'driver' => 'beanstalkd', 'host' => 'localhost', 'queue' => 'default', - ), + 'ttr' => 60, + ], - 'sqs' => array( + 'sqs' => [ 'driver' => 'sqs', 'key' => 'your-public-key', 'secret' => 'your-secret-key', 'queue' => 'your-queue-url', 'region' => 'us-east-1', - ), + ], - 'iron' => array( + 'iron' => [ 'driver' => 'iron', - 'project' => 'your-project-id', + 'host' => 'mq-aws-us-east-1.iron.io', 'token' => 'your-token', + 'project' => 'your-project-id', 'queue' => 'your-queue-name', - ), + 'encrypt' => true, + ], - 'redis' => array( + 'redis' => [ 'driver' => 'redis', 'queue' => 'default', - ), + 'expire' => 60, + ], - ), + ], /* |-------------------------------------------------------------------------- @@ -77,10 +85,8 @@ return array( | */ - 'failed' => array( - + 'failed' => [ 'database' => 'mysql', 'table' => 'failed_jobs', + ], - ), - -); +]; \ No newline at end of file diff --git a/config/session.php b/config/session.php index ba09f45af..739563bde 100644 --- a/config/session.php +++ b/config/session.php @@ -16,7 +16,7 @@ return [ | */ - 'driver' => env('SESSION_DRIVER', 'file'), + 'driver' => 'file', /* |-------------------------------------------------------------------------- diff --git a/config/view.php b/config/view.php index c0da05402..215dfafc2 100644 --- a/config/view.php +++ b/config/view.php @@ -1,6 +1,6 @@ array(__DIR__.'/../views'), + 'paths' => [ + realpath(base_path('resources/views')) + ], /* |-------------------------------------------------------------------------- - | Pagination View + | Compiled View Path |-------------------------------------------------------------------------- | - | This view will be used to render the pagination link output, and can - | be easily customized here to show any view you like. A clean view - | compatible with Twitter's Bootstrap is given to you by default. + | This option determines where all the compiled Blade templates will be + | stored for your application. Typically, this is within the storage + | directory. However, as usual, you are free to change this value. | */ - 'pagination' => 'pagination::slider-3', + 'compiled' => realpath(storage_path().'/framework/views'), -); +];