Skip to content

Commit

Permalink
Merge branch 'release/3.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
austintoddj committed Jan 4, 2017
2 parents 360979e + 1af79c1 commit e7667ee
Show file tree
Hide file tree
Showing 67 changed files with 599 additions and 10,191 deletions.
8 changes: 4 additions & 4 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ APP_TIMEZONE=America/Chicago

DB_CONNECTION=mysql
DB_HOST=localhost
DB_DATABASE=homestead
DB_USERNAME=homestead
DB_PASSWORD=secret
DB_DATABASE=canvas
DB_USERNAME=root
DB_PASSWORD=

CACHE_DRIVER=file
SESSION_DRIVER=file
Expand All @@ -20,4 +20,4 @@ MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null

SCOUT_DRIVER=tntsearch
SCOUT_DRIVER=tntsearch
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/vendor
/node_modules
/storage/*.index
/public/storage
/public/vendor
/storage/*.index
/tests/report

Thumbs.db
Expand All @@ -14,4 +15,8 @@ phpunit.xml
.project
.DS_Store
*.map

composer.lock
yarn.lock

npm-debug.log
76 changes: 76 additions & 0 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?php

$finder = Symfony\Component\Finder\Finder::create()
->notPath('bootstrap/cache')
->notPath('storage')
->notPath('vendor')
->notPath('resources/assets')
->notPath('public')
->in(__DIR__)
->name('*.php')
->ignoreDotFiles(true)
->ignoreVCS(true);

$fixers = [
'-psr0',
'-php_closing_tag',
'blankline_after_open_tag',
'concat_without_spaces',
'double_arrow_multiline_whitespaces',
'duplicate_semicolon',
'empty_return',
'extra_empty_lines',
'include',
'indentation',
'join_function',
'list_commas',
'multiple_use',
'multiline_array_trailing_comma',
'namespace_no_leading_whitespace',
'newline_after_open_tag',
'no_blank_lines_after_class_opening',
'no_empty_lines_after_phpdocs',
'object_operator',
'operators_spaces',
'phpdoc_indent',
'phpdoc_order',
'phpdoc_no_access',
'phpdoc_no_package',
'phpdoc_scalar',
'phpdoc_short_description',
'phpdoc_to_comment',
'phpdoc_trim',
'phpdoc_type_to_var',
'phpdoc_var_without_name',
'remove_leading_slash_use',
'remove_lines_between_uses',
'return',
'self_accessor',
'single_array_no_trailing_comma',
'single_blank_line_before_namespace',
'single_line_after_imports',
'single_quote',
'spaces_before_semicolon',
'spaces_cast',
'standardize_not_equal',
'ternary_spaces',
'trim_array_spaces',
'unalign_equals',
'unary_operators_spaces',
'whitespacy_lines',
'multiline_spaces_before_semicolon',
'short_array_syntax',
'short_echo_tag',
'function_call_space',
'method_argument_space',
'parenthesis',
'elseif',
'visibility',
'php_closing_tag',
];

return Symfony\CS\Config\Config::create()
->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
->fixers($fixers)
->finder($finder)
->setUsingCache(true);
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@ php:
- 7.1

before_install:
- if [[ $TRAVIS_PHP_VERSION != 7.1 ]] ; then phpenv config-rm xdebug.ini; fi
- mv .env.example .env
- travis_retry composer self-update

install:
- composer install

script:
- php artisan canvas:publish:assets -y
- php artisan canvas:publish:config -y
- php artisan canvas:publish:views -y
- php artisan key:generate
- vendor/bin/phpunit
4 changes: 4 additions & 0 deletions app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ public function render($request, Exception $e)
return response(view('canvas::errors.404'), 404);
break;

case $e instanceof \Symfony\Component\HttpKernel\Exception\HttpException:
return response(view('canvas::errors.503'), 503);
break;

default:
return parent::render($request, $e);
break;
Expand Down
32 changes: 0 additions & 32 deletions app/Http/Controllers/Auth/ForgotPasswordController.php

This file was deleted.

110 changes: 0 additions & 110 deletions app/Http/Controllers/Auth/LoginController.php

This file was deleted.

47 changes: 0 additions & 47 deletions app/Http/Controllers/Auth/PasswordController.php

This file was deleted.

Loading

0 comments on commit e7667ee

Please sign in to comment.