Skip to content

GitLab

"resources/views/vscode:/vscode.git/clone" did not exist on "b8f2b424b7fbd8a921b0037d32a04794d2d894d8"
Unverified Commit 5250d353 authored by Gabriel Antônio da Silva's avatar Gabriel Antônio da Silva Committed by GitHub
Browse files

Merge pull request #5 from lmts-ufape/submeter 

Funcionalidades básicas
parents 5de5a599 96ffb16f
Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/UserController.php
View file @ 5250d353
...@@ -6,13 +6,32 @@ use Illuminate\Http\Request; ...@@ -6,13 +6,32 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use App\User; use App\User;
use App\AdministradorResponsavel;
use App\Avaliador;
use App\Proponente;
use App\Participante;
use App\Endereco; use App\Endereco;
use App\Trabalho; use App\Trabalho;
use App\Coautor; use App\Coautor;
use App\Evento;
use Illuminate\Support\Facades\Log;
class UserController extends Controller class UserController extends Controller
{ {
//
public function index()
{
$eventos = Evento::all();
if(Auth::check()){
Log::debug('UserController check');
return redirect()->route('home');
}
Log::debug('UserController index');
return view('index', ['eventos' => $eventos]);
//return view('auth.login');
}
function perfil(){ function perfil(){
$user = User::find(Auth::user()->id); $user = User::find(Auth::user()->id);
$end = $user->endereco; $end = $user->endereco;
...@@ -93,9 +112,29 @@ class UserController extends Controller ...@@ -93,9 +112,29 @@ class UserController extends Controller
public function meusTrabalhos(){ public function meusTrabalhos(){
$trabalhos = Trabalho::where('autorId', Auth::user()->id)->get(); //$trabalhos = Trabalho::where('autorId', Auth::user()->id)->get();
$proponente = Proponente::with('user')->where('user_id', Auth::user()->id)->first();
$trabalhos = $proponente->trabalhos;
//dd($trabalhos);
return view('user.meusTrabalhos',[ return view('user.meusTrabalhos',[
'trabalhos' => $trabalhos, 'trabalhos' => $trabalhos,
]); ]);
} }
public function minhaConta() {
$id = Auth::user()->id;
$user = User::find($id);
$adminResp = AdministradorResponsavel::where('user_id', '=', $id)->first();
$avaliador = Avaliador::where('user_id', '=', $id)->first();
$proponente = Proponente::where('user_id', '=', $id)->first();
$participante = Participante::where('user_id', '=', $id)->first();
return view('user.perfilUser')->with(['user' => $user,
'adminResp' => $adminResp,
'avaliador' => $avaliador,
'proponente' => $proponente,
'participante' => $participante]);
}
} }
app/Http/Kernel.php
View file @ 5250d353
...@@ -19,6 +19,7 @@ class Kernel extends HttpKernel ...@@ -19,6 +19,7 @@ class Kernel extends HttpKernel
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class, \App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
//\App\Http\Middleware\checkAdministrador::class
]; ];
/** /**
...@@ -62,6 +63,8 @@ class Kernel extends HttpKernel ...@@ -62,6 +63,8 @@ class Kernel extends HttpKernel
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
'isTemp' => \App\Http\Middleware\IsTemp::class, 'isTemp' => \App\Http\Middleware\IsTemp::class,
'checkAdministrador' => \App\Http\Middleware\checkAdministrador::class,
'checkAdminResp' => \App\Http\Middleware\checkAdminResp::class,
]; ];
/** /**
......
app/Http/Middleware/checkAdminResp.php 0 → 100644
View file @ 5250d353
<?php
namespace App\Http\Middleware;
use Closure;
use Auth;
use Illuminate\Support\Facades\Log;
class checkAdminResp
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
if(!Auth::check()){
Log::debug('checkAdminResp');
return redirect('/');
}
if(Auth::user()->tipo=='administradorResponsavel' || Auth::user()->tipo=='administrador'){
return $next($request);
}
else{
return redirect('home')->with('error', 'Você não possui privilégios para acessa esta funcionalidade');
}
}
}
app/Http/Middleware/checkAdministrador.php 0 → 100644
View file @ 5250d353
<?php
namespace App\Http\Middleware;
use Auth;
use Closure;
use Illuminate\Support\Facades\Log;
class checkAdministrador
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
if(!Auth::check()){
Log::debug('checkAdministrador');
return redirect('/');
}
if(Auth::user()->tipo=='administrador'){
return $next($request);
}
else{
return redirect('home')->with('error', 'Você não possui privilégios para acessa esta funcionalidade');
}
}
}
app/Participante.php 0 → 100644
View file @ 5250d353
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class Participante extends Model
{
protected $fillable = ['name', 'user_id', 'trabalho_id'];
public function user(){
return $this->belongsTo('App\User');
}
public function trabalhos(){
return $this->belongsToMany('App\Trabalho', 'trabalho_participante');
}
}
app/PlanoTrabalho.php 0 → 100644
View file @ 5250d353
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class PlanoTrabalho extends Model
{
public function trabalho()
{
return $this->belongsTo('App\Trabalho');
}
}
app/Policies/AdminPolicy.php 0 → 100644
View file @ 5250d353
<?php
namespace App\Policies;
use App\User;
use Illuminate\Auth\Access\HandlesAuthorization;
class AdminPolicy
{
use HandlesAuthorization;
/**
* Create a new policy instance.
*
* @return void
*/
public function __construct()
{
//
}
public function isAdministrador(User $user) {
return $user->tipo === "administrador";
}
public function isAdminResp(User $user) {
return $user->tipo === "administradorResponsavel";
}
}
app/Policies/EventoPolicy.php
View file @ 5250d353
...@@ -4,6 +4,8 @@ namespace App\Policies; ...@@ -4,6 +4,8 @@ namespace App\Policies;
use App\User; use App\User;
use App\Evento; use App\Evento;
use App\CoordenadorComissao;
use App\AdministradorResponsavel;
use Illuminate\Auth\Access\HandlesAuthorization; use Illuminate\Auth\Access\HandlesAuthorization;
class EventoPolicy class EventoPolicy
...@@ -21,6 +23,9 @@ class EventoPolicy ...@@ -21,6 +23,9 @@ class EventoPolicy
} }
public function isCoordenador(User $user, Evento $evento){ public function isCoordenador(User $user, Evento $evento){
return $user->id === $evento->coordenador->id;
return $evento->criador_id == Auth()->user()->id;
} }
} }
app/Proponente.php 0 → 100644
View file @ 5250d353
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class Proponente extends Model
{
public function user(){
return $this->belongsTo('App\User');
}
public function trabalhos(){
return $this->belongsToMany('App\Trabalho', 'trabalho_proponente');
}
}
app/Providers/AppServiceProvider.php
View file @ 5250d353
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
namespace App\Providers; namespace App\Providers;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use Illuminate\Support\Facades\Validator;
class AppServiceProvider extends ServiceProvider class AppServiceProvider extends ServiceProvider
{ {
...@@ -23,6 +24,6 @@ class AppServiceProvider extends ServiceProvider ...@@ -23,6 +24,6 @@ class AppServiceProvider extends ServiceProvider
*/ */
public function boot() public function boot()
{ {
// Validator::extend('cpf', '\App\Utils\CpfValidation@validate');
} }
} }
app/SubArea.php 0 → 100644
View file @ 5250d353
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class SubArea extends Model
{
//
}
app/Trabalho.php
View file @ 5250d353
...@@ -12,7 +12,26 @@ class Trabalho extends Model ...@@ -12,7 +12,26 @@ class Trabalho extends Model
* @var array * @var array
*/ */
protected $fillable = [ protected $fillable = [
'titulo', 'autores', 'data', 'modalidadeId', 'areaId', 'autorId', 'eventoId', 'resumo', 'avaliado' 'titulo',
'data',
'avaliado',
'decisaoCONSU',
'pontuacaoPlanilha',
'linkGrupoPesquisa',
'linkLattesEstudante',
'anexoDecisaoCONSU',
'anexoAutorizacaoComiteEtica',
'anexoLattesCoordenador',
'anexoPlanilhaPontuacao',
'anexoProjeto',
'grande_area_id',
'area_id',
'sub_area_id',
'evento_id',
'proponente_id',
'coordenador_id',
]; ];
public function recurso(){ public function recurso(){
...@@ -50,4 +69,19 @@ class Trabalho extends Model ...@@ -50,4 +69,19 @@ class Trabalho extends Model
public function evento(){ public function evento(){
return $this->belongsTo('App\Evento', 'eventoId'); return $this->belongsTo('App\Evento', 'eventoId');
} }
public function planoTrabalho(){
return $this->hasMany('App\PlanoTrabalho');
}
public function participantes(){
return $this->belongsToMany('App\Participante', 'trabalho_participante');
}
public function proponentes(){
return $this->belongsToMany('App\Proponente', 'trabalho_proponente');
}
public function coordenador(){
return $this->belongsTo('App\CoordenadorComissao');
}
public function avaliadors(){
return $this->belongsToMany('App\Avaliador');
}
} }
app/User.php
View file @ 5250d353
...@@ -20,7 +20,7 @@ class User extends Authenticatable implements MustVerifyEmail ...@@ -20,7 +20,7 @@ class User extends Authenticatable implements MustVerifyEmail
protected $fillable = [ protected $fillable = [
'name', 'email', 'password', 'cpf', 'instituicao', 'celular', 'name', 'email', 'password', 'cpf', 'instituicao', 'celular',
'especProfissional', 'enderecoId', 'especProfissional', 'enderecoId',
'usuarioTemp', 'usuarioTemp', 'tipo', 'user_id'
]; ];
/** /**
...@@ -76,8 +76,25 @@ class User extends Authenticatable implements MustVerifyEmail ...@@ -76,8 +76,25 @@ class User extends Authenticatable implements MustVerifyEmail
public function evento(){ public function evento(){
return $this->hasMany('App\Evento', 'coordenadorId'); return $this->hasMany('App\Evento', 'coordenadorId');
} }
public function administradors(){
return $this->hasMany('App\Administrador');
}
public function proponentes(){
return $this->hasMany('App\Proponente');
}
public function AdministradorResponsavel(){
return $this->hasMany('App\AdministradorResponsavel');
}
public function participantes(){
return $this->hasMany('App\Participante');
}
public function avaliadors(){
return $this->hasMany('App\Avaliador');
}
public function coordenadorComissao(){
return $this->hasMany('App\CoordenadorComissao');
}
public function sendPasswordResetNotification($token){ public function sendPasswordResetNotification($token){
$this->notify(new recuperacaoSenha($token)); $this->notify(new recuperacaoSenha($token));
} }
......
app/Utils/CpfValidation.php 0 → 100644
View file @ 5250d353
<?php namespace App\Utils;
class CpfValidation
{
public function validate($attribute, $value, $parameters, $validator)
{
return $this->isValidate($attribute, $value);
}
protected function isValidate($attribute, $value)
{
$c = preg_replace('/\D/', '', $value);
if (strlen($c) != 11 || preg_match("/^{$c[0]}{11}$/", $c)) {
return false;
}
for ($s = 10, $n = 0, $i = 0; $s >= 2; $n += $c[$i++] * $s--);
if ($c[9] != ((($n %= 11) < 2) ? 0 : 11 - $n)) {
return false;
}
for ($s = 11, $n = 0, $i = 0; $s >= 2; $n += $c[$i++] * $s--);
if ($c[10] != ((($n %= 11) < 2) ? 0 : 11 - $n)) {
return false;
}
return true;
}
}
\ No newline at end of file
bootstrap/cache/.gitignore 100644 → 100755
View file @ 5250d353
File mode changed from 100644 to 100755
composer.lock
View file @ 5250d353
...@@ -41,33 +41,37 @@ ...@@ -41,33 +41,37 @@
}, },
{ {
"name": "doctrine/inflector", "name": "doctrine/inflector",
"version": "1.3.1", "version": "2.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/inflector.git", "url": "https://github.com/doctrine/inflector.git",
"reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1" "reference": "3fc171224a316569faad2df6b18a1fd8cce5a56d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1", "url": "https://api.github.com/repos/doctrine/inflector/zipball/3fc171224a316569faad2df6b18a1fd8cce5a56d",
"reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1", "reference": "3fc171224a316569faad2df6b18a1fd8cce5a56d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1" "php": "^7.2 || ^8.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6.2" "doctrine/coding-standard": "^7.0",
"phpstan/phpstan": "^0.11",
"phpstan/phpstan-phpunit": "^0.11",
"phpstan/phpstan-strict-rules": "^0.11",
"phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.3.x-dev" "dev-master": "2.0.x-dev"
} }
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
...@@ -96,32 +100,38 @@ ...@@ -96,32 +100,38 @@
"email": "schmittjoh@gmail.com" "email": "schmittjoh@gmail.com"
} }
], ],
"description": "Common String Manipulations with regard to casing and singular/plural rules.", "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.",
"homepage": "http://www.doctrine-project.org", "homepage": "https://www.doctrine-project.org/projects/inflector.html",
"keywords": [ "keywords": [
"inflection", "inflection",
"pluralize", "inflector",
"singularize", "lowercase",
"string" "manipulation",
"php",
"plural",
"singular",
"strings",
"uppercase",
"words"
], ],
"time": "2019-10-30T19:59:35+00:00" "time": "2020-05-25T20:08:47+00:00"
}, },
{ {
"name": "doctrine/lexer", "name": "doctrine/lexer",
"version": "1.2.0", "version": "1.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/lexer.git", "url": "https://github.com/doctrine/lexer.git",
"reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6" "reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
"reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", "reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2" "php": "^7.2 || ^8.0"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^6.0", "doctrine/coding-standard": "^6.0",
...@@ -166,7 +176,7 @@ ...@@ -166,7 +176,7 @@
"parser", "parser",
"php" "php"
], ],
"time": "2019-10-30T14:39:59+00:00" "time": "2020-05-25T17:44:05+00:00"
}, },
{ {
"name": "dragonmantank/cron-expression", "name": "dragonmantank/cron-expression",
...@@ -387,16 +397,16 @@ ...@@ -387,16 +397,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "6.5.3", "version": "6.5.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e" "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
"reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e", "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -404,7 +414,7 @@ ...@@ -404,7 +414,7 @@
"guzzlehttp/promises": "^1.0", "guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.6.1", "guzzlehttp/psr7": "^1.6.1",
"php": ">=5.5", "php": ">=5.5",
"symfony/polyfill-intl-idn": "^1.11" "symfony/polyfill-intl-idn": "1.17.0"
}, },
"require-dev": { "require-dev": {
"ext-curl": "*", "ext-curl": "*",
...@@ -450,7 +460,7 @@ ...@@ -450,7 +460,7 @@
"rest", "rest",
"web service" "web service"
], ],
"time": "2020-04-18T10:38:46+00:00" "time": "2020-05-25T19:35:05+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
...@@ -576,20 +586,20 @@ ...@@ -576,20 +586,20 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v6.18.11", "version": "v6.18.16",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "73bc10bb23aab7539c8ffae6d5dc3c4b277de557" "reference": "73f18a6bc58fb91aa83925161db25aa3674b73e9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/73bc10bb23aab7539c8ffae6d5dc3c4b277de557", "url": "https://api.github.com/repos/laravel/framework/zipball/73f18a6bc58fb91aa83925161db25aa3674b73e9",
"reference": "73bc10bb23aab7539c8ffae6d5dc3c4b277de557", "reference": "73f18a6bc58fb91aa83925161db25aa3674b73e9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/inflector": "^1.1", "doctrine/inflector": "^1.4|^2.0",
"dragonmantank/cron-expression": "^2.0", "dragonmantank/cron-expression": "^2.0",
"egulias/email-validator": "^2.1.10", "egulias/email-validator": "^2.1.10",
"ext-json": "*", "ext-json": "*",
...@@ -610,6 +620,7 @@ ...@@ -610,6 +620,7 @@
"symfony/finder": "^4.3.4", "symfony/finder": "^4.3.4",
"symfony/http-foundation": "^4.3.4", "symfony/http-foundation": "^4.3.4",
"symfony/http-kernel": "^4.3.4", "symfony/http-kernel": "^4.3.4",
"symfony/polyfill-php73": "^1.17",
"symfony/process": "^4.3.4", "symfony/process": "^4.3.4",
"symfony/routing": "^4.3.4", "symfony/routing": "^4.3.4",
"symfony/var-dumper": "^4.3.4", "symfony/var-dumper": "^4.3.4",
...@@ -718,7 +729,7 @@ ...@@ -718,7 +729,7 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2020-04-28T15:18:58+00:00" "time": "2020-05-26T14:31:44+00:00"
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
...@@ -840,16 +851,16 @@ ...@@ -840,16 +851,16 @@
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
"version": "1.4.2", "version": "1.4.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/commonmark.git", "url": "https://github.com/thephpleague/commonmark.git",
"reference": "9e780d972185e4f737a03bade0fd34a9e67bbf31" "reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/9e780d972185e4f737a03bade0fd34a9e67bbf31", "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/412639f7cfbc0b31ad2455b2fe965095f66ae505",
"reference": "9e780d972185e4f737a03bade0fd34a9e67bbf31", "reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -910,46 +921,20 @@ ...@@ -910,46 +921,20 @@
"md", "md",
"parser" "parser"
], ],
"funding": [ "time": "2020-05-04T22:15:21+00:00"
{
"url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark",
"type": "custom"
},
{
"url": "https://www.colinodell.com/sponsor",
"type": "custom"
},
{
"url": "https://www.paypal.me/colinpodell/10.00",
"type": "custom"
},
{
"url": "https://github.com/colinodell",
"type": "github"
},
{
"url": "https://www.patreon.com/colinodell",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/league/commonmark",
"type": "tidelift"
}
],
"time": "2020-04-24T13:39:56+00:00"
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
"version": "1.0.67", "version": "1.0.69",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/flysystem.git", "url": "https://github.com/thephpleague/flysystem.git",
"reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e" "reference": "7106f78428a344bc4f643c233a94e48795f10967"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5b1f36c75c4bdde981294c2a0ebdb437ee6f275e", "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967",
"reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e", "reference": "7106f78428a344bc4f643c233a94e48795f10967",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1020,30 +1005,24 @@ ...@@ -1020,30 +1005,24 @@
"sftp", "sftp",
"storage" "storage"
], ],
"funding": [ "time": "2020-05-18T15:13:39+00:00"
{
"url": "https://offset.earth/frankdejonge",
"type": "other"
}
],
"time": "2020-04-16T13:21:26+00:00"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
"version": "2.0.2", "version": "2.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Seldaek/monolog.git", "url": "https://github.com/Seldaek/monolog.git",
"reference": "c861fcba2ca29404dc9e617eedd9eff4616986b8" "reference": "38914429aac460e8e4616c8cb486ecb40ec90bb1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/c861fcba2ca29404dc9e617eedd9eff4616986b8", "url": "https://api.github.com/repos/Seldaek/monolog/zipball/38914429aac460e8e4616c8cb486ecb40ec90bb1",
"reference": "c861fcba2ca29404dc9e617eedd9eff4616986b8", "reference": "38914429aac460e8e4616c8cb486ecb40ec90bb1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2", "php": ">=7.2",
"psr/log": "^1.0.1" "psr/log": "^1.0.1"
}, },
"provide": { "provide": {
...@@ -1054,11 +1033,11 @@ ...@@ -1054,11 +1033,11 @@
"doctrine/couchdb": "~1.0@dev", "doctrine/couchdb": "~1.0@dev",
"elasticsearch/elasticsearch": "^6.0", "elasticsearch/elasticsearch": "^6.0",
"graylog2/gelf-php": "^1.4.2", "graylog2/gelf-php": "^1.4.2",
"jakub-onderka/php-parallel-lint": "^0.9",
"php-amqplib/php-amqplib": "~2.4", "php-amqplib/php-amqplib": "~2.4",
"php-console/php-console": "^3.1.3", "php-console/php-console": "^3.1.3",
"php-parallel-lint/php-parallel-lint": "^1.0",
"phpspec/prophecy": "^1.6.1", "phpspec/prophecy": "^1.6.1",
"phpunit/phpunit": "^8.3", "phpunit/phpunit": "^8.5",
"predis/predis": "^1.1", "predis/predis": "^1.1",
"rollbar/rollbar": "^1.3", "rollbar/rollbar": "^1.3",
"ruflin/elastica": ">=0.90 <3.0", "ruflin/elastica": ">=0.90 <3.0",
...@@ -1107,20 +1086,20 @@ ...@@ -1107,20 +1086,20 @@
"logging", "logging",
"psr-3" "psr-3"
], ],
"time": "2019-12-20T14:22:59+00:00" "time": "2020-05-22T08:12:19+00:00"
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "2.33.0", "version": "2.34.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b" "reference": "3e87404329b8072295ea11d548b47a1eefe5a162"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/3e87404329b8072295ea11d548b47a1eefe5a162",
"reference": "4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b", "reference": "3e87404329b8072295ea11d548b47a1eefe5a162",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1144,7 +1123,8 @@ ...@@ -1144,7 +1123,8 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.x-dev" "dev-master": "2.x-dev",
"dev-3.x": "3.x-dev"
}, },
"laravel": { "laravel": {
"providers": [ "providers": [
...@@ -1179,17 +1159,7 @@ ...@@ -1179,17 +1159,7 @@
"datetime", "datetime",
"time" "time"
], ],
"funding": [ "time": "2020-05-19T22:14:16+00:00"
{
"url": "https://opencollective.com/Carbon",
"type": "open_collective"
},
{
"url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
"type": "tidelift"
}
],
"time": "2020-04-20T15:05:43+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
...@@ -1245,16 +1215,16 @@ ...@@ -1245,16 +1215,16 @@
}, },
{ {
"name": "opis/closure", "name": "opis/closure",
"version": "3.5.1", "version": "3.5.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/opis/closure.git", "url": "https://github.com/opis/closure.git",
"reference": "93ebc5712cdad8d5f489b500c59d122df2e53969" "reference": "cac47092144043d5d676e2e7cf8d0d2f83fc89ca"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/opis/closure/zipball/93ebc5712cdad8d5f489b500c59d122df2e53969", "url": "https://api.github.com/repos/opis/closure/zipball/cac47092144043d5d676e2e7cf8d0d2f83fc89ca",
"reference": "93ebc5712cdad8d5f489b500c59d122df2e53969", "reference": "cac47092144043d5d676e2e7cf8d0d2f83fc89ca",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1302,7 +1272,7 @@ ...@@ -1302,7 +1272,7 @@
"serialization", "serialization",
"serialize" "serialize"
], ],
"time": "2019-11-29T22:36:02+00:00" "time": "2020-05-25T09:32:45+00:00"
}, },
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
...@@ -1600,16 +1570,16 @@ ...@@ -1600,16 +1570,16 @@
}, },
{ {
"name": "psy/psysh", "name": "psy/psysh",
"version": "v0.10.3", "version": "v0.10.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bobthecow/psysh.git", "url": "https://github.com/bobthecow/psysh.git",
"reference": "2bde2fa03e05dff0aee834598b951d6fc7c6fe02" "reference": "a8aec1b2981ab66882a01cce36a49b6317dc3560"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/2bde2fa03e05dff0aee834598b951d6fc7c6fe02", "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a8aec1b2981ab66882a01cce36a49b6317dc3560",
"reference": "2bde2fa03e05dff0aee834598b951d6fc7c6fe02", "reference": "a8aec1b2981ab66882a01cce36a49b6317dc3560",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1668,7 +1638,7 @@ ...@@ -1668,7 +1638,7 @@
"interactive", "interactive",
"shell" "shell"
], ],
"time": "2020-04-07T06:44:48+00:00" "time": "2020-05-03T19:32:03+00:00"
}, },
{ {
"name": "ralouphie/getallheaders", "name": "ralouphie/getallheaders",
...@@ -1933,20 +1903,6 @@ ...@@ -1933,20 +1903,6 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-30T11:41:10+00:00" "time": "2020-03-30T11:41:10+00:00"
}, },
{ {
...@@ -2000,20 +1956,6 @@ ...@@ -2000,20 +1956,6 @@
], ],
"description": "Symfony CssSelector Component", "description": "Symfony CssSelector Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:56:45+00:00" "time": "2020-03-27T16:56:45+00:00"
}, },
{ {
...@@ -2070,20 +2012,6 @@ ...@@ -2070,20 +2012,6 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00" "time": "2020-03-27T16:54:36+00:00"
}, },
{ {
...@@ -2140,20 +2068,6 @@ ...@@ -2140,20 +2068,6 @@
], ],
"description": "Symfony ErrorHandler Component", "description": "Symfony ErrorHandler Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-30T14:07:33+00:00" "time": "2020-03-30T14:07:33+00:00"
}, },
{ {
...@@ -2224,20 +2138,6 @@ ...@@ -2224,20 +2138,6 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00" "time": "2020-03-27T16:54:36+00:00"
}, },
{ {
...@@ -2345,25 +2245,10 @@ ...@@ -2345,25 +2245,10 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00" "time": "2020-03-27T16:54:36+00:00"
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v4.4.8", "version": "v4.4.8",
"source": { "source": {
"type": "git", "type": "git",
...@@ -2415,20 +2300,6 @@ ...@@ -2415,20 +2300,6 @@
], ],
"description": "Symfony HttpFoundation Component", "description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-18T20:40:08+00:00" "time": "2020-04-18T20:40:08+00:00"
}, },
{ {
...@@ -2519,20 +2390,6 @@ ...@@ -2519,20 +2390,6 @@
], ],
"description": "Symfony HttpKernel Component", "description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-28T18:47:42+00:00" "time": "2020-04-28T18:47:42+00:00"
}, },
{ {
...@@ -2595,34 +2452,20 @@ ...@@ -2595,34 +2452,20 @@
"mime", "mime",
"mime-type" "mime-type"
], ],
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-17T03:29:44+00:00" "time": "2020-04-17T03:29:44+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
"version": "v1.15.0", "version": "v1.17.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git", "url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14" "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14", "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14", "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2634,7 +2477,7 @@ ...@@ -2634,7 +2477,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.15-dev" "dev-master": "1.17-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2667,34 +2510,20 @@ ...@@ -2667,34 +2510,20 @@
"polyfill", "polyfill",
"portable" "portable"
], ],
"funding": [ "time": "2020-05-12T16:14:59+00:00"
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-02-27T09:26:54+00:00"
}, },
{ {
"name": "symfony/polyfill-iconv", "name": "symfony/polyfill-iconv",
"version": "v1.15.0", "version": "v1.17.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git", "url": "https://github.com/symfony/polyfill-iconv.git",
"reference": "ad6d62792bfbcfc385dd34b424d4fcf9712a32c8" "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/ad6d62792bfbcfc385dd34b424d4fcf9712a32c8", "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c4de7601eefbf25f9d47190abe07f79fe0a27424",
"reference": "ad6d62792bfbcfc385dd34b424d4fcf9712a32c8", "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2706,7 +2535,7 @@ ...@@ -2706,7 +2535,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.15-dev" "dev-master": "1.17-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2740,34 +2569,20 @@ ...@@ -2740,34 +2569,20 @@
"portable", "portable",
"shim" "shim"
], ],
"funding": [ "time": "2020-05-12T16:47:27+00:00"
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-09T19:04:49+00:00"
}, },
{ {
"name": "symfony/polyfill-intl-idn", "name": "symfony/polyfill-intl-idn",
"version": "v1.15.0", "version": "v1.17.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git", "url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf" "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
"reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2781,7 +2596,7 @@ ...@@ -2781,7 +2596,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.15-dev" "dev-master": "1.17-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2816,34 +2631,20 @@ ...@@ -2816,34 +2631,20 @@
"portable", "portable",
"shim" "shim"
], ],
"funding": [ "time": "2020-05-12T16:47:27+00:00"
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-09T19:04:49+00:00"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.15.0", "version": "v1.17.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac" "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
"reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac", "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2855,7 +2656,7 @@ ...@@ -2855,7 +2656,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.15-dev" "dev-master": "1.17-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2889,34 +2690,20 @@ ...@@ -2889,34 +2690,20 @@
"portable", "portable",
"shim" "shim"
], ],
"funding": [ "time": "2020-05-12T16:47:27+00:00"
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-09T19:04:49+00:00"
}, },
{ {
"name": "symfony/polyfill-php72", "name": "symfony/polyfill-php72",
"version": "v1.15.0", "version": "v1.17.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php72.git", "url": "https://github.com/symfony/polyfill-php72.git",
"reference": "37b0976c78b94856543260ce09b460a7bc852747" "reference": "f048e612a3905f34931127360bdd2def19a5e582"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747", "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
"reference": "37b0976c78b94856543260ce09b460a7bc852747", "reference": "f048e612a3905f34931127360bdd2def19a5e582",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2925,7 +2712,7 @@ ...@@ -2925,7 +2712,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.15-dev" "dev-master": "1.17-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2958,34 +2745,20 @@ ...@@ -2958,34 +2745,20 @@
"portable", "portable",
"shim" "shim"
], ],
"funding": [ "time": "2020-05-12T16:47:27+00:00"
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-02-27T09:26:54+00:00"
}, },
{ {
"name": "symfony/polyfill-php73", "name": "symfony/polyfill-php73",
"version": "v1.15.0", "version": "v1.17.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php73.git", "url": "https://github.com/symfony/polyfill-php73.git",
"reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7" "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7", "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc",
"reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7", "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2994,7 +2767,7 @@ ...@@ -2994,7 +2767,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.15-dev" "dev-master": "1.17-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3030,21 +2803,7 @@ ...@@ -3030,21 +2803,7 @@
"portable", "portable",
"shim" "shim"
], ],
"funding": [ "time": "2020-05-12T16:47:27+00:00"
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-02-27T09:26:54+00:00"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
...@@ -3093,20 +2852,6 @@ ...@@ -3093,20 +2852,6 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-15T15:56:18+00:00" "time": "2020-04-15T15:56:18+00:00"
}, },
{ {
...@@ -3183,20 +2928,6 @@ ...@@ -3183,20 +2928,6 @@
"uri", "uri",
"url" "url"
], ],
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-21T19:59:53+00:00" "time": "2020-04-21T19:59:53+00:00"
}, },
{ {
...@@ -3331,20 +3062,6 @@ ...@@ -3331,20 +3062,6 @@
], ],
"description": "Symfony Translation Component", "description": "Symfony Translation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-12T16:45:36+00:00" "time": "2020-04-12T16:45:36+00:00"
}, },
{ {
...@@ -3478,20 +3195,6 @@ ...@@ -3478,20 +3195,6 @@
"debug", "debug",
"dump" "dump"
], ],
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-12T16:14:02+00:00" "time": "2020-04-12T16:14:02+00:00"
}, },
{ {
...@@ -3545,20 +3248,20 @@ ...@@ -3545,20 +3248,20 @@
}, },
{ {
"name": "vlucas/phpdotenv", "name": "vlucas/phpdotenv",
"version": "v3.6.3", "version": "v3.6.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/vlucas/phpdotenv.git", "url": "https://github.com/vlucas/phpdotenv.git",
"reference": "1b3103013797f04521c6cae5560f604649484066" "reference": "8b64814b356b96a90d2bc942b152c80d8888b8d4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1b3103013797f04521c6cae5560f604649484066", "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8b64814b356b96a90d2bc942b152c80d8888b8d4",
"reference": "1b3103013797f04521c6cae5560f604649484066", "reference": "8b64814b356b96a90d2bc942b152c80d8888b8d4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.4 || ^7.0", "php": "^5.4 || ^7.0 || ^8.0",
"phpoption/phpoption": "^1.5", "phpoption/phpoption": "^1.5",
"symfony/polyfill-ctype": "^1.9" "symfony/polyfill-ctype": "^1.9"
}, },
...@@ -3604,13 +3307,7 @@ ...@@ -3604,13 +3307,7 @@
"env", "env",
"environment" "environment"
], ],
"funding": [ "time": "2020-05-23T09:42:03+00:00"
{
"url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
"type": "tidelift"
}
],
"time": "2020-04-12T15:18:03+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
...@@ -3841,16 +3538,16 @@ ...@@ -3841,16 +3538,16 @@
}, },
{ {
"name": "filp/whoops", "name": "filp/whoops",
"version": "2.7.1", "version": "2.7.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/filp/whoops.git", "url": "https://github.com/filp/whoops.git",
"reference": "fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130" "reference": "17d0d3f266c8f925ebd035cd36f83cf802b47d4a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130", "url": "https://api.github.com/repos/filp/whoops/zipball/17d0d3f266c8f925ebd035cd36f83cf802b47d4a",
"reference": "fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130", "reference": "17d0d3f266c8f925ebd035cd36f83cf802b47d4a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3898,7 +3595,7 @@ ...@@ -3898,7 +3595,7 @@
"throwable", "throwable",
"whoops" "whoops"
], ],
"time": "2020-01-15T10:00:00+00:00" "time": "2020-05-05T12:28:07+00:00"
}, },
{ {
"name": "fzaninotto/faker", "name": "fzaninotto/faker",
...@@ -4090,30 +3787,33 @@ ...@@ -4090,30 +3787,33 @@
}, },
{ {
"name": "mockery/mockery", "name": "mockery/mockery",
"version": "1.3.1", "version": "1.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mockery/mockery.git", "url": "https://github.com/mockery/mockery.git",
"reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be" "reference": "6c6a7c533469873deacf998237e7649fc6b36223"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mockery/mockery/zipball/f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be", "url": "https://api.github.com/repos/mockery/mockery/zipball/6c6a7c533469873deacf998237e7649fc6b36223",
"reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be", "reference": "6c6a7c533469873deacf998237e7649fc6b36223",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"hamcrest/hamcrest-php": "~2.0", "hamcrest/hamcrest-php": "~2.0",
"lib-pcre": ">=7.0", "lib-pcre": ">=7.0",
"php": ">=5.6.0" "php": "^7.3.0"
},
"conflict": {
"phpunit/phpunit": "<8.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0" "phpunit/phpunit": "^8.0.0 || ^9.0.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.3.x-dev" "dev-master": "1.4.x-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -4151,7 +3851,7 @@ ...@@ -4151,7 +3851,7 @@
"test double", "test double",
"testing" "testing"
], ],
"time": "2019-12-26T09:49:15+00:00" "time": "2020-05-19T14:25:16+00:00"
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
...@@ -4832,16 +4532,16 @@ ...@@ -4832,16 +4532,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "8.5.4", "version": "8.5.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "8474e22d7d642f665084ba5ec780626cbd1efd23" "reference": "63dda3b212a0025d380a745f91bdb4d8c985adb7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8474e22d7d642f665084ba5ec780626cbd1efd23", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/63dda3b212a0025d380a745f91bdb4d8c985adb7",
"reference": "8474e22d7d642f665084ba5ec780626cbd1efd23", "reference": "63dda3b212a0025d380a745f91bdb4d8c985adb7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4911,17 +4611,7 @@ ...@@ -4911,17 +4611,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"funding": [ "time": "2020-05-22T13:51:52+00:00"
{
"url": "https://phpunit.de/donate.html",
"type": "custom"
},
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
"time": "2020-04-23T04:39:42+00:00"
}, },
{ {
"name": "scrivo/highlight.php", "name": "scrivo/highlight.php",
...@@ -5704,6 +5394,5 @@ ...@@ -5704,6 +5394,5 @@
"platform": { "platform": {
"php": "^7.2" "php": "^7.2"
}, },
"platform-dev": [], "platform-dev": []
"plugin-api-version": "1.1.0"
} }
database/migrations/2014_10_12_000000_create_users_table.php
View file @ 5250d353
...@@ -16,16 +16,17 @@ class CreateUsersTable extends Migration ...@@ -16,16 +16,17 @@ class CreateUsersTable extends Migration
Schema::create('users', function (Blueprint $table) { Schema::create('users', function (Blueprint $table) {
$table->bigIncrements('id'); $table->bigIncrements('id');
$table->string('name')->nullable(); $table->string('name')->nullable();
$table->string('email')->unique(); $table->string('email')->unique();
$table->timestamp('email_verified_at')->nullable();
$table->string('password'); $table->string('password');
$table->string('instituicao')->nullable(); $table->string('instituicao')->nullable();
$table->string('celular')->nullable(); $table->string('celular')->nullable();
$table->string('cpf')->nullable(); $table->string('cpf')->nullable();
$table->string('especProfissional')->nullable(); $table->string('tipo')->nullable();
$table->boolean('usuarioTemp')->nullable(); $table->boolean('usuarioTemp')->nullable();
$table->rememberToken(); $table->rememberToken();
$table->timestamps(); $table->timestamps();
$table->timestamp('email_verified_at')->nullable();
$table->integer('enderecoId')->nullable(); $table->integer('enderecoId')->nullable();
}); });
......
database/migrations/2020_02_05_123048_create_trabalhos_table.php
View file @ 5250d353
...@@ -15,17 +15,26 @@ class CreateTrabalhosTable extends Migration ...@@ -15,17 +15,26 @@ class CreateTrabalhosTable extends Migration
{ {
Schema::create('trabalhos', function (Blueprint $table) { Schema::create('trabalhos', function (Blueprint $table) {
$table->bigIncrements('id'); $table->bigIncrements('id');
$table->timestamps();
$table->string('titulo'); $table->string('titulo');
$table->string('autores')->nullable(); $table->boolean('avaliado')->nullable();
$table->string('linkGrupoPesquisa');
$table->string('linkLattesEstudante');
$table->string('pontuacaoPlanilha');
$table->date('data')->nullable(); $table->date('data')->nullable();
$table->text('resumo')->nullable(); //Anexos
$table->text('avaliado')->nullable(); $table->string('anexoProjeto');
$table->string('anexoDecisaoCONSU')->nullable();
$table->string('anexoPlanilhaPontuacao');
$table->string('anexoLattesCoordenador');
$table->string('anexoAutorizacaoComiteEtica');
//chaves estrangeiras
$table->unsignedBigInteger('grande_area_id');
$table->unsignedBigInteger('area_id');
$table->unsignedBigInteger('sub_area_id');
$table->unsignedBigInteger('evento_id');
$table->unsignedBigInteger('coordenador_id');
$table->integer('modalidadeId'); $table->timestamps();
$table->integer('areaId');
$table->integer('autorId');
$table->integer('eventoId');
}); });
} }
......
database/migrations/2020_02_05_123139_create_areas_table.php
View file @ 5250d353
...@@ -14,12 +14,13 @@ class CreateAreasTable extends Migration ...@@ -14,12 +14,13 @@ class CreateAreasTable extends Migration
public function up() public function up()
{ {
Schema::create('areas', function (Blueprint $table) { Schema::create('areas', function (Blueprint $table) {
$table->bigIncrements('id'); $table->bigIncrements('id');
$table->timestamps();
$table->string('nome'); $table->string('nome');
$table->integer('modalidadeId')->nullable(); $table->unsignedBigInteger('grande_area_id');
$table->integer('eventoId'); $table->timestamps();
// $table->integer('modalidadeId')->nullable();
// $table->integer('eventoId');
}); });
} }
......
database/migrations/2020_02_05_123153_create_eventos_table.php
View file @ 5250d353
...@@ -16,28 +16,21 @@ class CreateEventosTable extends Migration ...@@ -16,28 +16,21 @@ class CreateEventosTable extends Migration
Schema::create('eventos', function (Blueprint $table) { Schema::create('eventos', function (Blueprint $table) {
$table->bigIncrements('id'); $table->bigIncrements('id');
$table->timestamps(); $table->timestamps();
$table->string('nome')->nullable(); $table->string('nome')->nullable();
// $table->integer('numeroParticipantes');
$table->string('descricao')->nullable(); $table->string('descricao')->nullable();
$table->string('tipo')->nullable(); $table->string('tipo')->nullable();
$table->date('dataInicio')->nullable();
$table->date('dataFim')->nullable();
$table->date('inicioSubmissao')->nullable(); $table->date('inicioSubmissao')->nullable();
$table->date('fimSubmissao')->nullable(); $table->date('fimSubmissao')->nullable();
$table->date('inicioRevisao')->nullable(); $table->date('inicioRevisao')->nullable();
$table->date('fimRevisao')->nullable(); $table->date('fimRevisao')->nullable();
$table->date('inicioResultado')->nullable(); $table->date('resultado')->nullable();
$table->date('fimResultado')->nullable();
$table->integer('numMaxTrabalhos')->nullable(); $table->integer('numMaxTrabalhos')->nullable();
$table->integer('numMaxCoautores')->nullable(); $table->integer('numMaxCoautores')->nullable();
// $table->boolean('possuiTaxa');
// $table->double('valorTaxa');
$table->string('fotoEvento')->nullable();
$table->boolean('hasResumo')->nullable(); $table->boolean('hasResumo')->nullable();
$table->integer('criador_id')->nullable();
$table->integer('coordComissaoId')->nullable();
$table->integer('enderecoId')->nullable();
$table->integer('coordenadorId')->nullable(); $table->integer('coordenadorId')->nullable();
$table->string('pdfEdital')->nullable();
$table->string('modeloDocumento')->nullable();
}); });
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment