Merge pull request #6605 from portabilis/community-patch-2019-11-08

Community patch 08/11/2019

Merge pull request #6605 from portabilis/community-patch-2019-11-08
Community patch 08/11/2019
Eder Soares · GitHub
2 parents 05f9e7ae da049083
Showing 17 changed files with 39 additions and 28 deletions Show diff stats
app/Console/Commands/LegacyLinkCommand.php
app/Http/Controllers/BatchEnrollmentController.php
app/Http/Requests/BatchEnrollmentRequest.php
app/Http/Requests/EnrollmentRequest.php
app/Listeners/AuthenticatedUser.php
app/Mail/ErrorTrackerMail.php
app/Models/Individual.php
app/Models/School.php
app/Notifications/ResetPasswordNotification.php
app/Providers/AppServiceProvider.php
app/Services/SchoolClass/AvailableTimeService.php
composer.json
composer.lock
docker/php/Dockerfile
docker/php/pdflib.so
ieducar/intranet/include/clsPDF.inc.php
ieducar/intranet/include/relatorio.inc.php
@@ -59,6 +59,7 @@ class LegacyLinkCommand extends Command
                 'intranet/scripts',
                 'intranet/static',
                 'intranet/styles',
+                'intranet/tmp',
             ],
             '../' => [
                 'modules',
@@ -85,7 +85,6 @@ class BatchEnrollmentController extends Controller
      * Lista as enturmações da turma e possibilita a desenturmação em lote.
      *
      * @param LegacySchoolClass $schoolClass
-     * @param EnrollmentService $enrollmentService
      *
      * @return View
      */
@@ -3,7 +3,6 @@
 namespace App\Http\Requests;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Arr;
 class BatchEnrollmentRequest extends FormRequest
 {
@@ -3,7 +3,6 @@
 namespace App\Http\Requests;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Arr;
 class EnrollmentRequest extends FormRequest
 {
@@ -13,7 +13,7 @@ class AuthenticatedUser
      *
      * @param Authenticated $event
      *
-     * @return void
+     * @throws ValidationException
      */
     public function handle(Authenticated $event)
     {
@@ -25,7 +25,9 @@ class ErrorTrackerMail extends Mailable implements ShouldQueue
     /**
      * Create a new message instance.
      *
-     * @return void
+     * @param $to
+     * @param $subject
+     * @param $content
      */
     public function __construct($to, $subject, $content)
     {
@@ -75,6 +75,8 @@ class Individual extends Model
     }
     /**
+     * @param $value
+     *
      * @return string
      */
     public function getMotherNameAttribute($value)
@@ -87,6 +89,8 @@ class Individual extends Model
     }
     /**
+     * @param $value
+     *
      * @return string
      */
     public function getFatherNameAttribute($value)
@@ -99,6 +103,8 @@ class Individual extends Model
     }
     /**
+     * @param $value
+     *
      * @return string
      */
     public function getGuardianNameAttribute($value)
@@ -3,7 +3,6 @@
 namespace App\Models;
 use Illuminate\Database\Eloquent\Model;
-use App\Models\Enrollment;
 class School extends Model
 {
@@ -3,9 +3,8 @@
 namespace App\Notifications;
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
 class ResetPasswordNotification extends Notification
 {
@@ -2,22 +2,18 @@
 namespace App\Providers;
-use App\Models\SchoolManager;
-use App\Observers\SchoolManagerObserver;
+use App\Models\LegacyInstitution;
 use App\Providers\Postgres\DatabaseServiceProvider;
-use Exception;
 use App\Services\CacheManager;
-use App\Models\LegacyInstitution;
 use App\Services\StudentUnificationService;
 use Barryvdh\Debugbar\ServiceProvider as DebugbarServiceProvider;
-use iEducar\Support\Navigation\Breadcrumb;
+use Exception;
 use iEducar\Modules\ErrorTracking\HoneyBadgerTracker;
 use iEducar\Modules\ErrorTracking\Tracker;
+use iEducar\Support\Navigation\Breadcrumb;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
@@ -56,8 +56,8 @@ class AvailableTimeService
         $otherSchoolClass = $schoolClassQuery->get();
-        foreach ($otherSchoolClass as $otherSchoolClass) {
-            if ($this->schedulesMatch($schoolClass, $otherSchoolClass)) {
+        foreach ($otherSchoolClass as $oneSchoolClass) {
+            if ($this->schedulesMatch($schoolClass, $oneSchoolClass)) {
                 return false;
             }
         }
@@ -3,7 +3,7 @@
     "description": "Software livre de gestão escolar",
     "type": "project",
     "license": "GPL-2.0-or-later",
-    "version": "2.2.10",
+    "version": "2.2.11",
     "keywords": [
         "Portabilis",
         "i-Educar"
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "116b686879b5b854694e79285273460d",
+    "content-hash": "723270812ec0d482a57df66262869817",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -2375,16 +2375,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.2.5",
+            "version": "v4.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "b76bbc3c51f22c570648de48e8c2d941ed5e2cf2"
+                "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/b76bbc3c51f22c570648de48e8c2d941ed5e2cf2",
-                "reference": "b76bbc3c51f22c570648de48e8c2d941ed5e2cf2",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc",
+                "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc",
                 "shasum": ""
             },
             "require": {
@@ -2392,7 +2392,7 @@
                 "php": ">=7.0"
             },
             "require-dev": {
-                "ircmaxell/php-yacc": "0.0.4",
+                "ircmaxell/php-yacc": "0.0.5",
                 "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
             },
             "bin": [
@@ -2401,7 +2401,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-master": "4.3-dev"
                 }
             },
             "autoload": {
@@ -2423,7 +2423,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2019-10-25T18:33:07+00:00"
+            "time": "2019-11-08T13:50:10+00:00"
         },
         {
             "name": "opis/closure",
@@ -52,3 +52,6 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 COPY php.ini /usr/local/etc/php/php.ini
+
+COPY pdflib.so /usr/local/lib/php/extensions/no-debug-non-zts-20180731/pdflib.so
+RUN echo "extension=/usr/local/lib/php/extensions/no-debug-non-zts-20180731/pdflib.so" > /usr/local/etc/php/conf.d/pdflib.ini
@@ -145,7 +145,7 @@ class clsPDF
       // Construção de página normal
       $this->ClosePage();
       $this->numeroPagina++;
-      PDF_begin_page($this->pdf, $this->largura, $this->altura);
+      PDF_begin_page_ext($this->pdf, $this->largura, $this->altura, "");
       $this->pagOpened = TRUE;
     }
     else {
@@ -372,6 +372,10 @@ class clsPDF
    */
   public function insertImageScaled($tipo, $image, $x, $y, $maxWidth)
   {
+    if ($image == "") {
+        throw new Exception('Parametro $image vazio');
+    }
+
     $image = realpath($image);
     if (! is_readable($image)) {
       throw new Exception('Caminho para arquivo de imagem inválido: "' . $image . '"');
@@ -117,7 +117,11 @@ class relatorios
     $this->pdf->Write( $this->numeroPagina, $this->pdf->largura - $this->margem_direita - 25, 125, 15, 80, $this->fonte_titulo, 10, "#000000", "center" );
     // Insere o brasao da prefeitura
-    $image = config('legacy.app.template.pdf.logo', 'imagens/brasao.gif');
+    $brasaoDefault = 'imagens/nvp_brasao_print.gif';
+    $image = config('legacy.app.template.pdf.logo', $brasaoDefault);
+    if ($image == '') {
+        $image = $brasaoDefault;
+    }
     $this->pdf->insertImageScaled("gif", $image, $this->margem_esquerda + 4,
       74, 45);
	@@ -3,7 +3,6 @@		@@ -3,7 +3,6 @@
3	namespace App\Http\Requests;	3	namespace App\Http\Requests;
4		4
5	use Illuminate\Foundation\Http\FormRequest;	5	use Illuminate\Foundation\Http\FormRequest;
6	-use Illuminate\Support\Arr;
7		6
8	class BatchEnrollmentRequest extends FormRequest	7	class BatchEnrollmentRequest extends FormRequest
9	{	8	{
	@@ -13,7 +13,7 @@ class AuthenticatedUser		@@ -13,7 +13,7 @@ class AuthenticatedUser
13	*	13	*
14	* @param Authenticated $event	14	* @param Authenticated $event
15	*	15	*
16	- * @return void	16	+ * @throws ValidationException
17	*/	17	*/
18	public function handle(Authenticated $event)	18	public function handle(Authenticated $event)
19	{	19	{
	@@ -3,7 +3,6 @@		@@ -3,7 +3,6 @@
3	namespace App\Models;	3	namespace App\Models;
4		4
5	use Illuminate\Database\Eloquent\Model;	5	use Illuminate\Database\Eloquent\Model;
6	-use App\Models\Enrollment;
7		6
8	class School extends Model	7	class School extends Model
9	{	8	{
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3	"description": "Software livre de gestão escolar",	3	"description": "Software livre de gestão escolar",
4	"type": "project",	4	"type": "project",
5	"license": "GPL-2.0-or-later",	5	"license": "GPL-2.0-or-later",
6	- "version": "2.2.10",	6	+ "version": "2.2.11",
7	"keywords": [	7	"keywords": [
8	"Portabilis",	8	"Portabilis",
9	"i-Educar"	9	"i-Educar"
	@@ -52,3 +52,6 @@ RUN curl -sS https://getcomposer.org/installer \| php -- --install-dir=/usr/local		@@ -52,3 +52,6 @@ RUN curl -sS https://getcomposer.org/installer \| php -- --install-dir=/usr/local
52	COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini	52	COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
53		53
54	COPY php.ini /usr/local/etc/php/php.ini	54	COPY php.ini /usr/local/etc/php/php.ini
		55	+
		56	+COPY pdflib.so /usr/local/lib/php/extensions/no-debug-non-zts-20180731/pdflib.so
		57	+RUN echo "extension=/usr/local/lib/php/extensions/no-debug-non-zts-20180731/pdflib.so" > /usr/local/etc/php/conf.d/pdflib.ini