Merge pull request #6 from BrokerExchange/feature/1.0

Mass Assignments/File Validation
BrokerExchange · May 15, 2018 · 6fc0876 · 6fc0876
2 parents 7b5f389 + 3f67c3e
commit 6fc0876
Show file tree

Hide file tree

Showing 15 changed files with 117 additions and 881 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/build-test-project.sh b/build-test-project.sh
@@ -22,9 +22,17 @@ sed -i '' "s/DB_DATABASE=homestead/DB_DATABASE=$db_database/g" .env
 sed -i '' "s/DB_USERNAME=homestead/DB_USERNAME=$db_username/g" .env
 sed -i '' "s/DB_PASSWORD=secret/DB_PASSWORD=$db_password/g" .env
 sed -i '' "s|// \$this->call(UsersTableSeeder::class);|\$this->call(UsersTableSeeder::class);|" ./database/seeds/DatabaseSeeder.php
+
+sed -i '' 's/Laravel\\Tinker\\TinkerServiceProvider::class,/Laravel\\Tinker\\TinkerServiceProvider::class,\
+        Showcase\\App\\Providers\\ShowcaseProvider::class,\
+        Laracasts\\Flash\\FlashServiceProvider::class,/' ./config/app.php
+
 cp ../UsersTableSeeder.php ./database/seeds/
-php artisan make:auth
 composer require brokerexchange/showcase=dev-feature/1.0
+composer dump-autoload
+echo "Pre auth"
+php artisan make:auth
+echo "Post auth"
 npm install
 cd ..
 bash update-test-project.sh --migrations --rundev

diff --git a/composer.json b/composer.json
@@ -13,8 +13,7 @@
         "fzaninotto/faker": "^1.4",
         "illuminate/filesystem": "^5.4",
         "illuminate/pagination": "^5.4",
-        "nesbot/carbon": "^1.27",
-        "doctrine/inflector": "1.1"
+        "nesbot/carbon": "^1.27"
     },
     "autoload": {
         "classmap": [