Download as
Browse Code »

Commit 30a302a01da926adaea0a84c39f8a586cf3f1769

Authored by Eder Soares
Committed by GitHub
2 parents b3b5475c 26f9e396
Exists in 2.8 and in 6 other branches 2.2, 2.3, 2.4, 2.5, 2.6, 2.7

Merge pull request #6530 from portabilis/community-patch-2019-10-22 

Community patch 22/10/2019
Showing 3 changed files with 31 additions and 31 deletions   Show diff stats
composer.json
  Diff comments   View file @30a302a
... ... @@ -3,7 +3,7 @@
3 3 "description": "Software livre de gestão escolar",
4 4 "type": "project",
5 5 "license": "GPL-2.0-or-later",
6   - "version": "2.2.9",
  6 + "version": "2.2.10",
7 7 "keywords": [
8 8 "Portabilis",
9 9 "i-Educar"
... ...
composer.lock
  Diff comments   View file @30a302a
... ... @@ -4,20 +4,20 @@
4 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
5 5 "This file is @generated automatically"
6 6 ],
7   - "content-hash": "b03e79b5d95d52de66fbe631b2bc6f71",
  7 + "content-hash": "b809688eaf9970067bfc1abc85b1a398",
8 8 "packages": [
9 9 {
10 10 "name": "aws/aws-sdk-php",
11   - "version": "3.112.19",
  11 + "version": "3.112.25",
12 12 "source": {
13 13 "type": "git",
14 14 "url": "https://github.com/aws/aws-sdk-php.git",
15   - "reference": "8e69a518ff058612b94d328c2cde644621a4c0cc"
  15 + "reference": "f91e264e3cbf8ced5c93f5f786c9e0f079926749"
16 16 },
17 17 "dist": {
18 18 "type": "zip",
19   - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8e69a518ff058612b94d328c2cde644621a4c0cc",
20   - "reference": "8e69a518ff058612b94d328c2cde644621a4c0cc",
  19 + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f91e264e3cbf8ced5c93f5f786c9e0f079926749",
  20 + "reference": "f91e264e3cbf8ced5c93f5f786c9e0f079926749",
21 21 "shasum": ""
22 22 },
23 23 "require": {
... ... @@ -87,7 +87,7 @@
87 87 "s3",
88 88 "sdk"
89 89 ],
90   - "time": "2019-10-10T18:23:11+00:00"
  90 + "time": "2019-10-18T18:08:55+00:00"
91 91 },
92 92 {
93 93 "name": "cocur/slugify",
... ... @@ -1522,16 +1522,16 @@
1522 1522 },
1523 1523 {
1524 1524 "name": "league/flysystem",
1525   - "version": "1.0.55",
  1525 + "version": "1.0.57",
1526 1526 "source": {
1527 1527 "type": "git",
1528 1528 "url": "https://github.com/thephpleague/flysystem.git",
1529   - "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6"
  1529 + "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a"
1530 1530 },
1531 1531 "dist": {
1532 1532 "type": "zip",
1533   - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/33c91155537c6dc899eacdc54a13ac6303f156e6",
1534   - "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6",
  1533 + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
  1534 + "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
1535 1535 "shasum": ""
1536 1536 },
1537 1537 "require": {
... ... @@ -1602,7 +1602,7 @@
1602 1602 "sftp",
1603 1603 "storage"
1604 1604 ],
1605   - "time": "2019-08-24T11:17:19+00:00"
  1605 + "time": "2019-10-16T21:01:05+00:00"
1606 1606 },
1607 1607 {
1608 1608 "name": "league/flysystem-aws-s3-v3",
... ... @@ -2065,16 +2065,16 @@
2065 2065 },
2066 2066 {
2067 2067 "name": "nesbot/carbon",
2068   - "version": "2.25.1",
  2068 + "version": "2.25.2",
2069 2069 "source": {
2070 2070 "type": "git",
2071 2071 "url": "https://github.com/briannesbitt/Carbon.git",
2072   - "reference": "d59c6cea9c4a3547bb6c0dfec451319abdaa4fb1"
  2072 + "reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f"
2073 2073 },
2074 2074 "dist": {
2075 2075 "type": "zip",
2076   - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d59c6cea9c4a3547bb6c0dfec451319abdaa4fb1",
2077   - "reference": "d59c6cea9c4a3547bb6c0dfec451319abdaa4fb1",
  2076 + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/443fe5f1498147e0fbc792142b5dc43e2e8a533f",
  2077 + "reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f",
2078 2078 "shasum": ""
2079 2079 },
2080 2080 "require": {
... ... @@ -2128,7 +2128,7 @@
2128 2128 "datetime",
2129 2129 "time"
2130 2130 ],
2131   - "time": "2019-10-05T15:52:23+00:00"
  2131 + "time": "2019-10-14T14:18:59+00:00"
2132 2132 },
2133 2133 {
2134 2134 "name": "nikic/php-parser",
... ... @@ -5337,25 +5337,25 @@
5337 5337 },
5338 5338 {
5339 5339 "name": "maximebf/debugbar",
5340   - "version": "v1.15.0",
  5340 + "version": "v1.15.1",
5341 5341 "source": {
5342 5342 "type": "git",
5343 5343 "url": "https://github.com/maximebf/php-debugbar.git",
5344   - "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07"
  5344 + "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e"
5345 5345 },
5346 5346 "dist": {
5347 5347 "type": "zip",
5348   - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30e7d60937ee5f1320975ca9bc7bcdd44d500f07",
5349   - "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07",
  5348 + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6c4277f6117e4864966c9cb58fb835cee8c74a1e",
  5349 + "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e",
5350 5350 "shasum": ""
5351 5351 },
5352 5352 "require": {
5353   - "php": ">=5.3.0",
  5353 + "php": ">=5.6",
5354 5354 "psr/log": "^1.0",
5355   - "symfony/var-dumper": "^2.6|^3.0|^4.0"
  5355 + "symfony/var-dumper": "^2.6|^3|^4"
5356 5356 },
5357 5357 "require-dev": {
5358   - "phpunit/phpunit": "^4.0|^5.0"
  5358 + "phpunit/phpunit": "^5"
5359 5359 },
5360 5360 "suggest": {
5361 5361 "kriswallsmith/assetic": "The best way to manage assets",
... ... @@ -5365,7 +5365,7 @@
5365 5365 "type": "library",
5366 5366 "extra": {
5367 5367 "branch-alias": {
5368   - "dev-master": "1.14-dev"
  5368 + "dev-master": "1.15-dev"
5369 5369 }
5370 5370 },
5371 5371 "autoload": {
... ... @@ -5394,7 +5394,7 @@
5394 5394 "debug",
5395 5395 "debugbar"
5396 5396 ],
5397   - "time": "2017-12-15T11:13:46+00:00"
  5397 + "time": "2019-09-24T14:55:42+00:00"
5398 5398 },
5399 5399 {
5400 5400 "name": "mockery/mockery",
... ...
ieducar/lib/App/Model/IedFinder.php
  Diff comments   View file @30a302a
... ... @@ -1113,18 +1113,18 @@ class App_Model_IedFinder extends CoreExt_Entity
1113 1113 return;
1114 1114 }
1115 1115  
1116   - $discipline = Cache::store('array')->remember("disciplinaDispensadaDaTurma:{$codTurma}", now()->addMinute(), function () use ($codTurma) {
1117   - $discipline = LegacySchoolClass::query()->find($codTurma)->ref_cod_disciplina_dispensada;
1118   -
  1116 + $discipline = Cache::store('array')->remember("disciplinaDispensadaDaTurma:{$codTurma}", now()->addMinute(), function () use ($codTurma) {
  1117 + $discipline = LegacySchoolClass::query()->find($codTurma)->ref_cod_disciplina_dispensada ?? null;
  1118 +
1119 1119 // Caso não exista a disciplina, armazena a string 'null'
1120 1120 return $discipline ?: 'null';
1121 1121 });
1122   -
  1122 +
1123 1123 // Se o retorno é uma string 'null', sabemos o que o valor real é null
1124 1124 if ($discipline === 'null') {
1125 1125 return null;
1126 1126 }
1127   -
  1127 +
1128 1128 return $discipline;
1129 1129 }
1130 1130  
... ...