Skip to content
This repository has been archived by the owner on Aug 5, 2021. It is now read-only.

Commit

Permalink
Merge pull request #3 from BrokerExchange/feature/1.0
Browse files Browse the repository at this point in the history
Feature/1.0
  • Loading branch information
Jantho1990 authored May 10, 2018
2 parents b2aee9d + b793087 commit 680c4ca
Show file tree
Hide file tree
Showing 62 changed files with 48 additions and 6,445 deletions.
2 changes: 1 addition & 1 deletion build-test-project.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [ -d "./test-project" ]; then
echo "Removed old test project."
fi

composer create-project laravel/laravel test-project 5.5.*
composer create-project laravel/laravel test-project 5.4.*
php ./edit-composer.php
cd test-project
sed -i '' "s/DB_HOST=127.0.0.1/DB_HOST=$db_host/g" .env
Expand Down
20 changes: 5 additions & 15 deletions package/composer.json → composer.backup.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,15 @@
"authors": [
{
"name": "Josh Anthony",
"email": "jantho1990@gmail.com"
"email": "janthony@brokerbin.com"
}
],
"require": {
"laracasts/flash": "^3.0",
"illuminate/database": "^5.4",
"doctrine/dbal": "^2.5",
"fzaninotto/faker": "^1.4",
"illuminate/filesystem": "^5.4",
"illuminate/pagination": "^5.4",
"nesbot/carbon": "^1.27"
"laracasts/flash": "^3.0"
},
"autoload": {
"classmap": [
"src/database/seeds",
"src/database/factories",
"src/database/migrations"
],
"psr-4": {
"Showcase\\": "src/"
"Showcase\\": "package/src/"
}
},
"require-dev": {
Expand All @@ -35,5 +24,6 @@
"Showcase\\App\\Providers\\ShowcaseProvider"
]
}
}
},
"license": "GPL-2.0-or-later"
}
16 changes: 13 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,20 @@
}
],
"require": {
"laracasts/flash": "^3.0"
"laracasts/flash": "^3.0",
"illuminate/database": "^5.4",
"doctrine/dbal": "^2.5",
"fzaninotto/faker": "^1.4",
"illuminate/filesystem": "^5.4",
"illuminate/pagination": "^5.4",
"nesbot/carbon": "^1.27"
},
"autoload": {
"classmap": [
"src/database/seeds",
"src/database/factories",
"src/database/migrations"
],
"psr-4": {
"Showcase\\": "src/"
}
Expand All @@ -24,6 +35,5 @@
"Showcase\\App\\Providers\\ShowcaseProvider"
]
}
},
"license": "GPL-2.0-or-later"
}
}
7 changes: 2 additions & 5 deletions edit-composer.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@
// var_dump($composer);
$composer['repositories'] = json_decode('[
{
"type": "path",
"url": "../package",
"options": {
"symlink": true
}
"type": "vcs",
"url": "../"
}
]');
$composer['minimum-stability'] = "dev";
Expand Down
Loading

0 comments on commit 680c4ca

Please sign in to comment.