Skip to content

Commit

Permalink
Merge pull request #6 from Szasza/master
Browse files Browse the repository at this point in the history
updating psysh dependency to 0.7|0.8, php-cs-fixer package change update, minor cleanup
  • Loading branch information
vluzrmos authored Jan 3, 2017
2 parents 32fcdc1 + d91608c commit 17789f4
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 26 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ vendor
lumen.log
.php_cs.cache
tmp[a-zA-Z0-9]{6,99}
Vagrantfile
.vagrant/
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
language: php

php:
- 5.5
- 5.6
- 7.0
- 7.1
- hhvm

before_script:
- travis_retry composer self-update
- travis_retry composer install --prefer-source --no-interaction --dev
- travis_retry composer install --prefer-source --no-interaction

script:
- "phpunit --process-isolation"
17 changes: 10 additions & 7 deletions bootstrap.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

require_once 'vendor/autoload.php';
require_once __DIR__ . '/vendor/autoload.php';

$path = __DIR__.'/fixture';

Expand Down Expand Up @@ -34,9 +34,15 @@
|
*/

$app->singleton('Illuminate\Contracts\Console\Kernel', 'App\Console\Kernel');
$app->singleton(
Illuminate\Contracts\Console\Kernel::class,
App\Console\Kernel::class
);

$app->get('awesome/action', 'AwesomeController@action');
$app->singleton(
Illuminate\Contracts\Debug\ExceptionHandler::class,
Laravel\Lumen\Exceptions\Handler::class
);

/*
|--------------------------------------------------------------------------
Expand All @@ -50,11 +56,8 @@
*/

$app->middleware([
Illuminate\Cookie\Middleware\EncryptCookies::class,
Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
Illuminate\Session\Middleware\StartSession::class,
Illuminate\View\Middleware\ShareErrorsFromSession::class,
Laravel\Lumen\Http\Middleware\VerifyCsrfToken::class,
Illuminate\View\Middleware\ShareErrorsFromSession::class
]);

$app->routeMiddleware([]);
Expand Down
30 changes: 17 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,36 @@
"license": "MIT",
"type": "package",
"authors":[
{
"name": "Vagner do Carmo",
"email": "[email protected]"
}
{
"name": "Vagner do Carmo",
"email": "[email protected]"
},
{
"name": "Szabolcs (Szasza) Palmer",
"email": "[email protected]"
}
],
"require":{
"laravel/lumen-framework": "~5.1",
"psy/psysh":"~0.5.1|~0.6.1"
"laravel/lumen-framework": "~5.3",
"psy/psysh":"~0.7.0|~0.8.0"
},
"require-dev":{
"phpunit/phpunit": "~4.0",
"fzaninotto/faker": "~1.4",
"fabpot/php-cs-fixer": "~2.0"
"phpunit/phpunit": "~5.0",
"fzaninotto/faker": "~1.4",
"friendsofphp/php-cs-fixer": "^2.0"
},
"autoload": {
"psr-4": {
"Vluzrmos\\Tinker\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"App\\": "fixture/app/"
}
"psr-4": {
"App\\": "fixture/app/"
}
},
"config":{
"preferred-install":"dist"
"preferred-install":"dist"
},
"minimum-stability":"dev"
}
1 change: 1 addition & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Package Versions:
|-------|--------|
| 5.0 | 1.0.* |
| 5.1 | 1.1.* |
| 5.3 | 1.3.* |

Download from packagist:

Expand Down
2 changes: 1 addition & 1 deletion src/TinkerServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class TinkerServiceProvider extends ServiceProvider
public function register()
{
$this->commands([
'Vluzrmos\Tinker\TinkerCommand',
TinkerCommand::class,
]);
}
}
9 changes: 6 additions & 3 deletions src/TinkerShell.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
namespace Vluzrmos\Tinker;

use Illuminate\Contracts\Console\Kernel as Console;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Collection;
use Laravel\Lumen\Application;
use Psy\Configuration;
use Psy\Shell;

Expand Down Expand Up @@ -88,9 +91,9 @@ public function getShell()
protected function getCasters()
{
return [
'Laravel\Lumen\Application' => 'Vluzrmos\Tinker\TinkerCaster::castApplication',
'Illuminate\Support\Collection' => 'Vluzrmos\Tinker\TinkerCaster::castCollection',
'Illuminate\Database\Eloquent\Model' => 'Vluzrmos\Tinker\TinkerCaster::castModel',
Application::class => 'Vluzrmos\Tinker\TinkerCaster::castApplication',
Collection::class => 'Vluzrmos\Tinker\TinkerCaster::castCollection',
Model::class => 'Vluzrmos\Tinker\TinkerCaster::castModel',
];
}

Expand Down

0 comments on commit 17789f4

Please sign in to comment.