Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migração para Laravel 5.6 #24

Merged
merged 31 commits into from
Feb 6, 2019
Merged

Migração para Laravel 5.6 #24

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
eee0c15
Harpia revisado para PHP 7.2+
lucassouzavieira May 25, 2018
783535f
Removidas funções depreciadas no PHP 7.2
lucassouzavieira May 25, 2018
e88c42c
Revisão DiplomaRepository
lucassouzavieira May 28, 2018
894d460
Atualizadas dependências para Laravel 5.6
lucassouzavieira May 28, 2018
44e4dfc
Merge remote-tracking branch 'origin/master' into migracao-laravel-5.6
lucassouzavieira May 28, 2018
ed0ec41
Remoção comando 'optimize' do arquivo Composer.json
lucassouzavieira May 28, 2018
384bd4d
Atualização nos testes para PHPUnit 7+
lucassouzavieira May 28, 2018
737b75d
Revisão testes unitários
lucassouzavieira May 28, 2018
94e7e4d
Atualizada versão mínima do PHP (7.1.3)
lucassouzavieira May 28, 2018
fe04b9c
Revisão Codacy
lucassouzavieira May 28, 2018
ea05875
Merge branch 'master' into master
fhpimenta May 29, 2018
dc6e9d7
Merge remote-tracking branch 'upstream/master'
lucassouzavieira May 29, 2018
c5d3b29
Merge branch 'master' of https://github.com/lucassouzavieira/harpia
lucassouzavieira May 29, 2018
442d87e
Merge remote-tracking branch 'origin/master' into migracao-laravel-5.6
lucassouzavieira May 29, 2018
b56e8fe
Revisão Codacy
lucassouzavieira Jun 7, 2018
f36fe34
Atualizados relatórios PDF (Mpdf 7.1+)
lucassouzavieira Jun 8, 2018
21046b2
Configurações PHPUnit
lucassouzavieira Jun 8, 2018
ddf0407
Merge branch 'migracao-laravel-5.6'
lucassouzavieira Jun 8, 2018
4c20262
Ajustes na exportação de Certificados e Diplomas
lucassouzavieira Jun 8, 2018
5ea87a7
Merge remote-tracking branch 'upstream/master'
lucassouzavieira Jun 8, 2018
ba19ee3
Merge remote-tracking branch 'upstream/master'
lucassouzavieira Jun 8, 2018
99f8c33
Merge branch 'master' of https://github.com/lucassouzavieira/harpia
lucassouzavieira Jun 8, 2018
fc6cc72
Merge branch 'revisao-events-delete'
lucassouzavieira Sep 12, 2018
acbe68f
Revisão de casos redundantes de eventos de exclusão
lucassouzavieira Sep 12, 2018
4903f7c
Atualização do arquivo docker-compose para utilizar php7.2
fhpimenta Sep 12, 2018
e8a449f
Merge remote-tracking branch 'upstream/master'
lucassouzavieira Sep 27, 2018
63e0148
Merge branch 'master' into migracao-laravel-5.6
lucassouzavieira Sep 27, 2018
60db303
Revisão de teste de deleteMatricula
lucassouzavieira Sep 27, 2018
9fa682d
Merge remote-tracking branch 'upstream/master' into migracao-laravel-5.6
lucassouzavieira Sep 27, 2018
aa0bbb0
Revisão de teste de AlunoRepository
lucassouzavieira Sep 27, 2018
ab303e0
Merge remote-tracking branch 'upstream/master' into migracao-laravel-5.6
lucassouzavieira Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ dist: trusty
sudo: required

php:
- 7.1
- '7.1'
- '7.2'

before_script:
- cp .env.travis .env
Expand Down
44 changes: 22 additions & 22 deletions app/Console/Commands/ModulosMigrate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public function handle()
{
$modulos = config('modulos.modulos');

while (list(, $modulo) = each($modulos)) {
foreach ($modulos as $modulo) {

// Load the migrations
$moduloPath = '/modulos/' . $modulo.'/Database/Migrations';
$moduloPath = '/modulos/' . $modulo . '/Database/Migrations';
$dirPath = base_path() . $moduloPath;
if (is_dir($dirPath)) {
Artisan::call('migrate', ['--path' => $moduloPath]);
Expand All @@ -55,14 +55,14 @@ public function handle()
if ($this->option('seed') == 'prod') {
$modulos = config('modulos.modulos');

while (list(, $modulo) = each($modulos)) {
foreach ($modulos as $modulo) {

// Load the migrations
if ($modulo == 'Seguranca') {
$class = '\Modulos\\'. $modulo .'\Database\Seeds\\'. $modulo .'Seeder';
} else {
$class = '\Modulos\\'. $modulo .'\Database\Seeds\Production\\'. $modulo .'Seeder';
}
// Load the migrations
if ($modulo == 'Seguranca') {
$class = '\Modulos\\' . $modulo . '\Database\Seeds\\' . $modulo . 'Seeder';
} else {
$class = '\Modulos\\' . $modulo . '\Database\Seeds\Production\\' . $modulo . 'Seeder';
}

if (class_exists($class)) {
Artisan::call('db:seed', ['--class' => $class]);
Expand All @@ -75,25 +75,25 @@ public function handle()
if ($this->option('seed') == 'dev') {
$modulos = config('modulos.modulos');

while (list(, $modulo) = each($modulos)) {
foreach ($modulos as $modulo) {

// Load the migrations
if ($modulo == 'Seguranca') {
$class = '\Modulos\\'. $modulo .'\Database\Seeds\\'. $modulo .'Seeder';
} else {
$class = '\Modulos\\'. $modulo .'\Database\Seeds\Production\\'. $modulo .'Seeder';
}
// Load the migrations
if ($modulo == 'Seguranca') {
$class = '\Modulos\\' . $modulo . '\Database\Seeds\\' . $modulo . 'Seeder';
} else {
$class = '\Modulos\\' . $modulo . '\Database\Seeds\Production\\' . $modulo . 'Seeder';
}
if (class_exists($class)) {
Artisan::call('db:seed', ['--class' => $class]);
$this->info($modulo . ' Seed complete!');
}

// Load the migrations
if ($modulo == 'Seguranca') {
$class = null;
} else {
$class = '\Modulos\\'. $modulo .'\Database\Seeds\Development\\'. $modulo .'Seeder';
}
// Load the migrations
if ($modulo == 'Seguranca') {
$class = null;
} else {
$class = '\Modulos\\' . $modulo . '\Database\Seeds\Development\\' . $modulo . 'Seeder';
}
if (class_exists($class)) {
Artisan::call('db:seed', ['--class' => $class]);
$this->info($modulo . ' Development Seed complete!');
Expand Down
40 changes: 20 additions & 20 deletions app/Console/Commands/ModulosSeed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,39 +41,39 @@ public function handle()
$modulos = config('modulos.modulos');

if ($this->option('dev')) {
while (list(, $modulo) = each($modulos)) {
foreach ($modulos as $modulo) {

// Load the migrations
if ($modulo == 'Seguranca') {
$class = '\Modulos\\'. $modulo .'\Database\Seeds\\'. $modulo .'Seeder';
} else {
$class = '\Modulos\\'. $modulo .'\Database\Seeds\Production\\'. $modulo .'Seeder';
}
// Load the migrations
if ($modulo == 'Seguranca') {
$class = '\Modulos\\' . $modulo . '\Database\Seeds\\' . $modulo . 'Seeder';
} else {
$class = '\Modulos\\' . $modulo . '\Database\Seeds\Production\\' . $modulo . 'Seeder';
}
if (class_exists($class)) {
Artisan::call('db:seed', ['--class' => $class]);
$this->info($modulo . ' Seed complete!');
}

// Load the migrations
if ($modulo == 'Seguranca') {
$class = null;
} else {
$class = '\Modulos\\'. $modulo .'\Database\Seeds\Development\\'. $modulo .'Seeder';
}
// Load the migrations
if ($modulo == 'Seguranca') {
$class = null;
} else {
$class = '\Modulos\\' . $modulo . '\Database\Seeds\Development\\' . $modulo . 'Seeder';
}
if (class_exists($class)) {
Artisan::call('db:seed', ['--class' => $class]);
$this->info($modulo . ' Development Seed complete!');
}
}
} else {
while (list(, $modulo) = each($modulos)) {
foreach ($modulos as $modulo) {

// Load the migrations
if ($modulo == 'Seguranca') {
$class = '\Modulos\\'. $modulo .'\Database\Seeds\\'. $modulo .'Seeder';
} else {
$class = '\Modulos\\'. $modulo .'\Database\Seeds\Production\\'. $modulo .'Seeder';
}
// Load the migrations
if ($modulo == 'Seguranca') {
$class = '\Modulos\\' . $modulo . '\Database\Seeds\\' . $modulo . 'Seeder';
} else {
$class = '\Modulos\\' . $modulo . '\Database\Seeds\Production\\' . $modulo . 'Seeder';
}

if (class_exists($class)) {
Artisan::call('db:seed', ['--class' => $class]);
Expand Down
20 changes: 9 additions & 11 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"license": "MIT",
"type": "project",
"require": {
"php": ">=7.0.0",
"laravel/framework": "5.5.*",
"laravelcollective/html": "5.5.*",
"php": ">=7.1.3",
"laravel/framework": "5.6.*",
"laravelcollective/html": "5.6.*",
"stevebauman/eloquenttable": "1.1.*",
"guzzlehttp/guzzle": "^6.2",
"mpdf/mpdf": "^6.1",
Expand All @@ -21,13 +21,13 @@
"filp/whoops": "^2.0",
"mockery/mockery": "0.9.*",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*",
"phpunit/phpunit": "~6.0",
"phpunit/php-code-coverage": "^5.0",
"symfony/dom-crawler": "^4.0",
"phpunit/phpunit": "~7.0",
"phpunit/php-code-coverage": "^6.0",
"squizlabs/php_codesniffer": "~2.6",
"friendsofphp/php-cs-fixer": "~2.0",
"symfony/console": "~3.1",
"brianium/paratest": "^1.1",
"symfony/console": "^4.0",
"brianium/paratest": "~2.0",
"codacy/coverage": "dev-master"
},
"autoload": {
Expand Down Expand Up @@ -58,13 +58,11 @@
],
"post-install-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postInstall",
"php artisan optimize",
"chmod +x fixcode",
"bash bin/setup.sh"
],
"post-update-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
"php artisan optimize"
"Illuminate\\Foundation\\ComposerScripts::postUpdate"
],
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
Expand Down
Loading