Commit 823b86002af054589b97f0eb9baa52c5bb8c8059
Exists in
2.8
and in
6 other branches
Merge branch 'master' into portabilis-patch-2019-11-01
Showing
17 changed files
with
101 additions
and
90 deletions
Show diff stats
app/Console/Commands/LegacyLinkCommand.php
app/Http/Controllers/BatchEnrollmentController.php
| ... | ... | @@ -85,7 +85,6 @@ class BatchEnrollmentController extends Controller |
| 85 | 85 | * Lista as enturmações da turma e possibilita a desenturmação em lote. |
| 86 | 86 | * |
| 87 | 87 | * @param LegacySchoolClass $schoolClass |
| 88 | - * @param EnrollmentService $enrollmentService | |
| 89 | 88 | * |
| 90 | 89 | * @return View |
| 91 | 90 | */ | ... | ... |
app/Http/Requests/BatchEnrollmentRequest.php
app/Http/Requests/EnrollmentRequest.php
app/Listeners/AuthenticatedUser.php
app/Mail/ErrorTrackerMail.php
| ... | ... | @@ -25,7 +25,9 @@ class ErrorTrackerMail extends Mailable implements ShouldQueue |
| 25 | 25 | /** |
| 26 | 26 | * Create a new message instance. |
| 27 | 27 | * |
| 28 | - * @return void | |
| 28 | + * @param $to | |
| 29 | + * @param $subject | |
| 30 | + * @param $content | |
| 29 | 31 | */ |
| 30 | 32 | public function __construct($to, $subject, $content) |
| 31 | 33 | { | ... | ... |
app/Models/Individual.php
| ... | ... | @@ -75,6 +75,8 @@ class Individual extends Model |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
| 78 | + * @param $value | |
| 79 | + * | |
| 78 | 80 | * @return string |
| 79 | 81 | */ |
| 80 | 82 | public function getMotherNameAttribute($value) |
| ... | ... | @@ -87,6 +89,8 @@ class Individual extends Model |
| 87 | 89 | } |
| 88 | 90 | |
| 89 | 91 | /** |
| 92 | + * @param $value | |
| 93 | + * | |
| 90 | 94 | * @return string |
| 91 | 95 | */ |
| 92 | 96 | public function getFatherNameAttribute($value) |
| ... | ... | @@ -99,6 +103,8 @@ class Individual extends Model |
| 99 | 103 | } |
| 100 | 104 | |
| 101 | 105 | /** |
| 106 | + * @param $value | |
| 107 | + * | |
| 102 | 108 | * @return string |
| 103 | 109 | */ |
| 104 | 110 | public function getGuardianNameAttribute($value) | ... | ... |
app/Models/School.php
app/Notifications/ResetPasswordNotification.php
| ... | ... | @@ -3,9 +3,8 @@ |
| 3 | 3 | namespace App\Notifications; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Bus\Queueable; |
| 6 | -use Illuminate\Notifications\Notification; | |
| 7 | -use Illuminate\Contracts\Queue\ShouldQueue; | |
| 8 | 6 | use Illuminate\Notifications\Messages\MailMessage; |
| 7 | +use Illuminate\Notifications\Notification; | |
| 9 | 8 | |
| 10 | 9 | class ResetPasswordNotification extends Notification |
| 11 | 10 | { | ... | ... |
app/Providers/AppServiceProvider.php
| ... | ... | @@ -2,22 +2,18 @@ |
| 2 | 2 | |
| 3 | 3 | namespace App\Providers; |
| 4 | 4 | |
| 5 | -use App\Models\SchoolManager; | |
| 6 | -use App\Observers\SchoolManagerObserver; | |
| 5 | +use App\Models\LegacyInstitution; | |
| 7 | 6 | use App\Providers\Postgres\DatabaseServiceProvider; |
| 8 | -use Exception; | |
| 9 | 7 | use App\Services\CacheManager; |
| 10 | -use App\Models\LegacyInstitution; | |
| 11 | 8 | use App\Services\StudentUnificationService; |
| 12 | 9 | use Barryvdh\Debugbar\ServiceProvider as DebugbarServiceProvider; |
| 13 | -use iEducar\Support\Navigation\Breadcrumb; | |
| 10 | +use Exception; | |
| 14 | 11 | use iEducar\Modules\ErrorTracking\HoneyBadgerTracker; |
| 15 | 12 | use iEducar\Modules\ErrorTracking\Tracker; |
| 13 | +use iEducar\Support\Navigation\Breadcrumb; | |
| 16 | 14 | use Illuminate\Database\Eloquent\Collection; |
| 17 | -use Illuminate\Http\Request; | |
| 18 | 15 | use Illuminate\Pagination\Paginator; |
| 19 | 16 | use Illuminate\Support\Facades\Auth; |
| 20 | -use Illuminate\Support\Facades\Blade; | |
| 21 | 17 | use Illuminate\Support\Facades\Cache; |
| 22 | 18 | use Illuminate\Support\Facades\Schema; |
| 23 | 19 | use Illuminate\Support\ServiceProvider; | ... | ... |
app/Services/SchoolClass/AvailableTimeService.php
| ... | ... | @@ -56,8 +56,8 @@ class AvailableTimeService |
| 56 | 56 | |
| 57 | 57 | $otherSchoolClass = $schoolClassQuery->get(); |
| 58 | 58 | |
| 59 | - foreach ($otherSchoolClass as $otherSchoolClass) { | |
| 60 | - if ($this->schedulesMatch($schoolClass, $otherSchoolClass)) { | |
| 59 | + foreach ($otherSchoolClass as $oneSchoolClass) { | |
| 60 | + if ($this->schedulesMatch($schoolClass, $oneSchoolClass)) { | |
| 61 | 61 | return false; |
| 62 | 62 | } |
| 63 | 63 | } | ... | ... |
composer.json
composer.lock
| ... | ... | @@ -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": "0c2ad06b02b00d28509f500a06f5b97a", | |
| 7 | + "content-hash": "ffb5f99ce02176307dfbc3565763770e", | |
| 8 | 8 | "packages": [ |
| 9 | 9 | { |
| 10 | 10 | "name": "aws/aws-sdk-php", |
| 11 | - "version": "3.112.32", | |
| 11 | + "version": "3.112.34", | |
| 12 | 12 | "source": { |
| 13 | 13 | "type": "git", |
| 14 | 14 | "url": "https://github.com/aws/aws-sdk-php.git", |
| 15 | - "reference": "1e211dcb7dcf757b041890f072bbaa593b39512a" | |
| 15 | + "reference": "5918919b64550f7436a01738ea49e56703c83799" | |
| 16 | 16 | }, |
| 17 | 17 | "dist": { |
| 18 | 18 | "type": "zip", |
| 19 | - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1e211dcb7dcf757b041890f072bbaa593b39512a", | |
| 20 | - "reference": "1e211dcb7dcf757b041890f072bbaa593b39512a", | |
| 19 | + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5918919b64550f7436a01738ea49e56703c83799", | |
| 20 | + "reference": "5918919b64550f7436a01738ea49e56703c83799", | |
| 21 | 21 | "shasum": "" |
| 22 | 22 | }, |
| 23 | 23 | "require": { |
| ... | ... | @@ -87,7 +87,7 @@ |
| 87 | 87 | "s3", |
| 88 | 88 | "sdk" |
| 89 | 89 | ], |
| 90 | - "time": "2019-10-30T18:37:36+00:00" | |
| 90 | + "time": "2019-11-01T18:08:35+00:00" | |
| 91 | 91 | }, |
| 92 | 92 | { |
| 93 | 93 | "name": "cocur/slugify", |
| ... | ... | @@ -2788,16 +2788,16 @@ |
| 2788 | 2788 | }, |
| 2789 | 2789 | { |
| 2790 | 2790 | "name": "psr/log", |
| 2791 | - "version": "1.1.1", | |
| 2791 | + "version": "1.1.2", | |
| 2792 | 2792 | "source": { |
| 2793 | 2793 | "type": "git", |
| 2794 | 2794 | "url": "https://github.com/php-fig/log.git", |
| 2795 | - "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2" | |
| 2795 | + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" | |
| 2796 | 2796 | }, |
| 2797 | 2797 | "dist": { |
| 2798 | 2798 | "type": "zip", |
| 2799 | - "url": "https://api.github.com/repos/php-fig/log/zipball/bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2", | |
| 2800 | - "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2", | |
| 2799 | + "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", | |
| 2800 | + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", | |
| 2801 | 2801 | "shasum": "" |
| 2802 | 2802 | }, |
| 2803 | 2803 | "require": { |
| ... | ... | @@ -2831,7 +2831,7 @@ |
| 2831 | 2831 | "psr", |
| 2832 | 2832 | "psr-3" |
| 2833 | 2833 | ], |
| 2834 | - "time": "2019-10-25T08:06:51+00:00" | |
| 2834 | + "time": "2019-11-01T11:05:21+00:00" | |
| 2835 | 2835 | }, |
| 2836 | 2836 | { |
| 2837 | 2837 | "name": "psr/simple-cache", |
| ... | ... | @@ -3191,16 +3191,16 @@ |
| 3191 | 3191 | }, |
| 3192 | 3192 | { |
| 3193 | 3193 | "name": "symfony/console", |
| 3194 | - "version": "v4.3.5", | |
| 3194 | + "version": "v4.3.6", | |
| 3195 | 3195 | "source": { |
| 3196 | 3196 | "type": "git", |
| 3197 | 3197 | "url": "https://github.com/symfony/console.git", |
| 3198 | - "reference": "929ddf360d401b958f611d44e726094ab46a7369" | |
| 3198 | + "reference": "136c4bd62ea871d00843d1bc0316de4c4a84bb78" | |
| 3199 | 3199 | }, |
| 3200 | 3200 | "dist": { |
| 3201 | 3201 | "type": "zip", |
| 3202 | - "url": "https://api.github.com/repos/symfony/console/zipball/929ddf360d401b958f611d44e726094ab46a7369", | |
| 3203 | - "reference": "929ddf360d401b958f611d44e726094ab46a7369", | |
| 3202 | + "url": "https://api.github.com/repos/symfony/console/zipball/136c4bd62ea871d00843d1bc0316de4c4a84bb78", | |
| 3203 | + "reference": "136c4bd62ea871d00843d1bc0316de4c4a84bb78", | |
| 3204 | 3204 | "shasum": "" |
| 3205 | 3205 | }, |
| 3206 | 3206 | "require": { |
| ... | ... | @@ -3262,11 +3262,11 @@ |
| 3262 | 3262 | ], |
| 3263 | 3263 | "description": "Symfony Console Component", |
| 3264 | 3264 | "homepage": "https://symfony.com", |
| 3265 | - "time": "2019-10-07T12:36:49+00:00" | |
| 3265 | + "time": "2019-10-30T12:58:49+00:00" | |
| 3266 | 3266 | }, |
| 3267 | 3267 | { |
| 3268 | 3268 | "name": "symfony/css-selector", |
| 3269 | - "version": "v4.3.5", | |
| 3269 | + "version": "v4.3.6", | |
| 3270 | 3270 | "source": { |
| 3271 | 3271 | "type": "git", |
| 3272 | 3272 | "url": "https://github.com/symfony/css-selector.git", |
| ... | ... | @@ -3319,16 +3319,16 @@ |
| 3319 | 3319 | }, |
| 3320 | 3320 | { |
| 3321 | 3321 | "name": "symfony/debug", |
| 3322 | - "version": "v4.3.5", | |
| 3322 | + "version": "v4.3.6", | |
| 3323 | 3323 | "source": { |
| 3324 | 3324 | "type": "git", |
| 3325 | 3325 | "url": "https://github.com/symfony/debug.git", |
| 3326 | - "reference": "cc5c1efd0edfcfd10b354750594a46b3dd2afbbe" | |
| 3326 | + "reference": "5ea9c3e01989a86ceaa0283f21234b12deadf5e2" | |
| 3327 | 3327 | }, |
| 3328 | 3328 | "dist": { |
| 3329 | 3329 | "type": "zip", |
| 3330 | - "url": "https://api.github.com/repos/symfony/debug/zipball/cc5c1efd0edfcfd10b354750594a46b3dd2afbbe", | |
| 3331 | - "reference": "cc5c1efd0edfcfd10b354750594a46b3dd2afbbe", | |
| 3330 | + "url": "https://api.github.com/repos/symfony/debug/zipball/5ea9c3e01989a86ceaa0283f21234b12deadf5e2", | |
| 3331 | + "reference": "5ea9c3e01989a86ceaa0283f21234b12deadf5e2", | |
| 3332 | 3332 | "shasum": "" |
| 3333 | 3333 | }, |
| 3334 | 3334 | "require": { |
| ... | ... | @@ -3371,11 +3371,11 @@ |
| 3371 | 3371 | ], |
| 3372 | 3372 | "description": "Symfony Debug Component", |
| 3373 | 3373 | "homepage": "https://symfony.com", |
| 3374 | - "time": "2019-09-19T15:51:53+00:00" | |
| 3374 | + "time": "2019-10-28T17:07:32+00:00" | |
| 3375 | 3375 | }, |
| 3376 | 3376 | { |
| 3377 | 3377 | "name": "symfony/event-dispatcher", |
| 3378 | - "version": "v4.3.5", | |
| 3378 | + "version": "v4.3.6", | |
| 3379 | 3379 | "source": { |
| 3380 | 3380 | "type": "git", |
| 3381 | 3381 | "url": "https://github.com/symfony/event-dispatcher.git", |
| ... | ... | @@ -3503,16 +3503,16 @@ |
| 3503 | 3503 | }, |
| 3504 | 3504 | { |
| 3505 | 3505 | "name": "symfony/finder", |
| 3506 | - "version": "v4.3.5", | |
| 3506 | + "version": "v4.3.6", | |
| 3507 | 3507 | "source": { |
| 3508 | 3508 | "type": "git", |
| 3509 | 3509 | "url": "https://github.com/symfony/finder.git", |
| 3510 | - "reference": "5e575faa95548d0586f6bedaeabec259714e44d1" | |
| 3510 | + "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f" | |
| 3511 | 3511 | }, |
| 3512 | 3512 | "dist": { |
| 3513 | 3513 | "type": "zip", |
| 3514 | - "url": "https://api.github.com/repos/symfony/finder/zipball/5e575faa95548d0586f6bedaeabec259714e44d1", | |
| 3515 | - "reference": "5e575faa95548d0586f6bedaeabec259714e44d1", | |
| 3514 | + "url": "https://api.github.com/repos/symfony/finder/zipball/72a068f77e317ae77c0a0495236ad292cfb5ce6f", | |
| 3515 | + "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f", | |
| 3516 | 3516 | "shasum": "" |
| 3517 | 3517 | }, |
| 3518 | 3518 | "require": { |
| ... | ... | @@ -3548,20 +3548,20 @@ |
| 3548 | 3548 | ], |
| 3549 | 3549 | "description": "Symfony Finder Component", |
| 3550 | 3550 | "homepage": "https://symfony.com", |
| 3551 | - "time": "2019-09-16T11:29:48+00:00" | |
| 3551 | + "time": "2019-10-30T12:53:54+00:00" | |
| 3552 | 3552 | }, |
| 3553 | 3553 | { |
| 3554 | 3554 | "name": "symfony/http-foundation", |
| 3555 | - "version": "v4.3.5", | |
| 3555 | + "version": "v4.3.6", | |
| 3556 | 3556 | "source": { |
| 3557 | 3557 | "type": "git", |
| 3558 | 3558 | "url": "https://github.com/symfony/http-foundation.git", |
| 3559 | - "reference": "76590ced16d4674780863471bae10452b79210a5" | |
| 3559 | + "reference": "38f63e471cda9d37ac06e76d14c5ea2ec5887051" | |
| 3560 | 3560 | }, |
| 3561 | 3561 | "dist": { |
| 3562 | 3562 | "type": "zip", |
| 3563 | - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/76590ced16d4674780863471bae10452b79210a5", | |
| 3564 | - "reference": "76590ced16d4674780863471bae10452b79210a5", | |
| 3563 | + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/38f63e471cda9d37ac06e76d14c5ea2ec5887051", | |
| 3564 | + "reference": "38f63e471cda9d37ac06e76d14c5ea2ec5887051", | |
| 3565 | 3565 | "shasum": "" |
| 3566 | 3566 | }, |
| 3567 | 3567 | "require": { |
| ... | ... | @@ -3603,20 +3603,20 @@ |
| 3603 | 3603 | ], |
| 3604 | 3604 | "description": "Symfony HttpFoundation Component", |
| 3605 | 3605 | "homepage": "https://symfony.com", |
| 3606 | - "time": "2019-10-04T19:48:13+00:00" | |
| 3606 | + "time": "2019-10-30T12:58:49+00:00" | |
| 3607 | 3607 | }, |
| 3608 | 3608 | { |
| 3609 | 3609 | "name": "symfony/http-kernel", |
| 3610 | - "version": "v4.3.5", | |
| 3610 | + "version": "v4.3.6", | |
| 3611 | 3611 | "source": { |
| 3612 | 3612 | "type": "git", |
| 3613 | 3613 | "url": "https://github.com/symfony/http-kernel.git", |
| 3614 | - "reference": "5f08141850932e8019c01d8988bf3ed6367d2991" | |
| 3614 | + "reference": "56acfda9e734e8715b3b0e6859cdb4f5b28757bf" | |
| 3615 | 3615 | }, |
| 3616 | 3616 | "dist": { |
| 3617 | 3617 | "type": "zip", |
| 3618 | - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5f08141850932e8019c01d8988bf3ed6367d2991", | |
| 3619 | - "reference": "5f08141850932e8019c01d8988bf3ed6367d2991", | |
| 3618 | + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/56acfda9e734e8715b3b0e6859cdb4f5b28757bf", | |
| 3619 | + "reference": "56acfda9e734e8715b3b0e6859cdb4f5b28757bf", | |
| 3620 | 3620 | "shasum": "" |
| 3621 | 3621 | }, |
| 3622 | 3622 | "require": { |
| ... | ... | @@ -3695,20 +3695,20 @@ |
| 3695 | 3695 | ], |
| 3696 | 3696 | "description": "Symfony HttpKernel Component", |
| 3697 | 3697 | "homepage": "https://symfony.com", |
| 3698 | - "time": "2019-10-07T15:06:41+00:00" | |
| 3698 | + "time": "2019-11-01T10:00:03+00:00" | |
| 3699 | 3699 | }, |
| 3700 | 3700 | { |
| 3701 | 3701 | "name": "symfony/mime", |
| 3702 | - "version": "v4.3.5", | |
| 3702 | + "version": "v4.3.6", | |
| 3703 | 3703 | "source": { |
| 3704 | 3704 | "type": "git", |
| 3705 | 3705 | "url": "https://github.com/symfony/mime.git", |
| 3706 | - "reference": "32f71570547b91879fdbd9cf50317d556ae86916" | |
| 3706 | + "reference": "3c0e197529da6e59b217615ba8ee7604df88b551" | |
| 3707 | 3707 | }, |
| 3708 | 3708 | "dist": { |
| 3709 | 3709 | "type": "zip", |
| 3710 | - "url": "https://api.github.com/repos/symfony/mime/zipball/32f71570547b91879fdbd9cf50317d556ae86916", | |
| 3711 | - "reference": "32f71570547b91879fdbd9cf50317d556ae86916", | |
| 3710 | + "url": "https://api.github.com/repos/symfony/mime/zipball/3c0e197529da6e59b217615ba8ee7604df88b551", | |
| 3711 | + "reference": "3c0e197529da6e59b217615ba8ee7604df88b551", | |
| 3712 | 3712 | "shasum": "" |
| 3713 | 3713 | }, |
| 3714 | 3714 | "require": { |
| ... | ... | @@ -3754,7 +3754,7 @@ |
| 3754 | 3754 | "mime", |
| 3755 | 3755 | "mime-type" |
| 3756 | 3756 | ], |
| 3757 | - "time": "2019-09-19T17:00:15+00:00" | |
| 3757 | + "time": "2019-10-30T12:58:49+00:00" | |
| 3758 | 3758 | }, |
| 3759 | 3759 | { |
| 3760 | 3760 | "name": "symfony/polyfill-ctype", |
| ... | ... | @@ -4109,16 +4109,16 @@ |
| 4109 | 4109 | }, |
| 4110 | 4110 | { |
| 4111 | 4111 | "name": "symfony/process", |
| 4112 | - "version": "v4.3.5", | |
| 4112 | + "version": "v4.3.6", | |
| 4113 | 4113 | "source": { |
| 4114 | 4114 | "type": "git", |
| 4115 | 4115 | "url": "https://github.com/symfony/process.git", |
| 4116 | - "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b" | |
| 4116 | + "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0" | |
| 4117 | 4117 | }, |
| 4118 | 4118 | "dist": { |
| 4119 | 4119 | "type": "zip", |
| 4120 | - "url": "https://api.github.com/repos/symfony/process/zipball/50556892f3cc47d4200bfd1075314139c4c9ff4b", | |
| 4121 | - "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b", | |
| 4120 | + "url": "https://api.github.com/repos/symfony/process/zipball/3b2e0cb029afbb0395034509291f21191d1a4db0", | |
| 4121 | + "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0", | |
| 4122 | 4122 | "shasum": "" |
| 4123 | 4123 | }, |
| 4124 | 4124 | "require": { |
| ... | ... | @@ -4154,20 +4154,20 @@ |
| 4154 | 4154 | ], |
| 4155 | 4155 | "description": "Symfony Process Component", |
| 4156 | 4156 | "homepage": "https://symfony.com", |
| 4157 | - "time": "2019-09-26T21:17:10+00:00" | |
| 4157 | + "time": "2019-10-28T17:07:32+00:00" | |
| 4158 | 4158 | }, |
| 4159 | 4159 | { |
| 4160 | 4160 | "name": "symfony/routing", |
| 4161 | - "version": "v4.3.5", | |
| 4161 | + "version": "v4.3.6", | |
| 4162 | 4162 | "source": { |
| 4163 | 4163 | "type": "git", |
| 4164 | 4164 | "url": "https://github.com/symfony/routing.git", |
| 4165 | - "reference": "3b174ef04fe66696524efad1e5f7a6c663d822ea" | |
| 4165 | + "reference": "63a9920cc86fcc745e5ea254e362f02b615290b9" | |
| 4166 | 4166 | }, |
| 4167 | 4167 | "dist": { |
| 4168 | 4168 | "type": "zip", |
| 4169 | - "url": "https://api.github.com/repos/symfony/routing/zipball/3b174ef04fe66696524efad1e5f7a6c663d822ea", | |
| 4170 | - "reference": "3b174ef04fe66696524efad1e5f7a6c663d822ea", | |
| 4169 | + "url": "https://api.github.com/repos/symfony/routing/zipball/63a9920cc86fcc745e5ea254e362f02b615290b9", | |
| 4170 | + "reference": "63a9920cc86fcc745e5ea254e362f02b615290b9", | |
| 4171 | 4171 | "shasum": "" |
| 4172 | 4172 | }, |
| 4173 | 4173 | "require": { |
| ... | ... | @@ -4230,7 +4230,7 @@ |
| 4230 | 4230 | "uri", |
| 4231 | 4231 | "url" |
| 4232 | 4232 | ], |
| 4233 | - "time": "2019-10-04T20:57:10+00:00" | |
| 4233 | + "time": "2019-10-30T12:58:49+00:00" | |
| 4234 | 4234 | }, |
| 4235 | 4235 | { |
| 4236 | 4236 | "name": "symfony/service-contracts", |
| ... | ... | @@ -4292,16 +4292,16 @@ |
| 4292 | 4292 | }, |
| 4293 | 4293 | { |
| 4294 | 4294 | "name": "symfony/translation", |
| 4295 | - "version": "v4.3.5", | |
| 4295 | + "version": "v4.3.6", | |
| 4296 | 4296 | "source": { |
| 4297 | 4297 | "type": "git", |
| 4298 | 4298 | "url": "https://github.com/symfony/translation.git", |
| 4299 | - "reference": "fe6193b066c457c144333c06aaa869a2d42a167f" | |
| 4299 | + "reference": "a3aa590ce944afb3434d7a55f81b00927144d5ec" | |
| 4300 | 4300 | }, |
| 4301 | 4301 | "dist": { |
| 4302 | 4302 | "type": "zip", |
| 4303 | - "url": "https://api.github.com/repos/symfony/translation/zipball/fe6193b066c457c144333c06aaa869a2d42a167f", | |
| 4304 | - "reference": "fe6193b066c457c144333c06aaa869a2d42a167f", | |
| 4303 | + "url": "https://api.github.com/repos/symfony/translation/zipball/a3aa590ce944afb3434d7a55f81b00927144d5ec", | |
| 4304 | + "reference": "a3aa590ce944afb3434d7a55f81b00927144d5ec", | |
| 4305 | 4305 | "shasum": "" |
| 4306 | 4306 | }, |
| 4307 | 4307 | "require": { |
| ... | ... | @@ -4364,7 +4364,7 @@ |
| 4364 | 4364 | ], |
| 4365 | 4365 | "description": "Symfony Translation Component", |
| 4366 | 4366 | "homepage": "https://symfony.com", |
| 4367 | - "time": "2019-09-27T14:37:39+00:00" | |
| 4367 | + "time": "2019-10-30T12:53:54+00:00" | |
| 4368 | 4368 | }, |
| 4369 | 4369 | { |
| 4370 | 4370 | "name": "symfony/translation-contracts", |
| ... | ... | @@ -4425,16 +4425,16 @@ |
| 4425 | 4425 | }, |
| 4426 | 4426 | { |
| 4427 | 4427 | "name": "symfony/var-dumper", |
| 4428 | - "version": "v4.3.5", | |
| 4428 | + "version": "v4.3.6", | |
| 4429 | 4429 | "source": { |
| 4430 | 4430 | "type": "git", |
| 4431 | 4431 | "url": "https://github.com/symfony/var-dumper.git", |
| 4432 | - "reference": "bde8957fc415fdc6964f33916a3755737744ff05" | |
| 4432 | + "reference": "ea4940845535c85ff5c505e13b3205b0076d07bf" | |
| 4433 | 4433 | }, |
| 4434 | 4434 | "dist": { |
| 4435 | 4435 | "type": "zip", |
| 4436 | - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/bde8957fc415fdc6964f33916a3755737744ff05", | |
| 4437 | - "reference": "bde8957fc415fdc6964f33916a3755737744ff05", | |
| 4436 | + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ea4940845535c85ff5c505e13b3205b0076d07bf", | |
| 4437 | + "reference": "ea4940845535c85ff5c505e13b3205b0076d07bf", | |
| 4438 | 4438 | "shasum": "" |
| 4439 | 4439 | }, |
| 4440 | 4440 | "require": { |
| ... | ... | @@ -4497,7 +4497,7 @@ |
| 4497 | 4497 | "debug", |
| 4498 | 4498 | "dump" |
| 4499 | 4499 | ], |
| 4500 | - "time": "2019-10-04T19:48:13+00:00" | |
| 4500 | + "time": "2019-10-13T12:02:04+00:00" | |
| 4501 | 4501 | }, |
| 4502 | 4502 | { |
| 4503 | 4503 | "name": "tijsverkoyen/css-to-inline-styles", |
| ... | ... | @@ -6997,7 +6997,7 @@ |
| 6997 | 6997 | }, |
| 6998 | 6998 | { |
| 6999 | 6999 | "name": "symfony/filesystem", |
| 7000 | - "version": "v4.3.5", | |
| 7000 | + "version": "v4.3.6", | |
| 7001 | 7001 | "source": { |
| 7002 | 7002 | "type": "git", |
| 7003 | 7003 | "url": "https://github.com/symfony/filesystem.git", |
| ... | ... | @@ -7047,16 +7047,16 @@ |
| 7047 | 7047 | }, |
| 7048 | 7048 | { |
| 7049 | 7049 | "name": "symfony/options-resolver", |
| 7050 | - "version": "v4.3.5", | |
| 7050 | + "version": "v4.3.6", | |
| 7051 | 7051 | "source": { |
| 7052 | 7052 | "type": "git", |
| 7053 | 7053 | "url": "https://github.com/symfony/options-resolver.git", |
| 7054 | - "reference": "81c2e120522a42f623233968244baebd6b36cb6a" | |
| 7054 | + "reference": "f46c7fc8e207bd8a2188f54f8738f232533765a4" | |
| 7055 | 7055 | }, |
| 7056 | 7056 | "dist": { |
| 7057 | 7057 | "type": "zip", |
| 7058 | - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/81c2e120522a42f623233968244baebd6b36cb6a", | |
| 7059 | - "reference": "81c2e120522a42f623233968244baebd6b36cb6a", | |
| 7058 | + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/f46c7fc8e207bd8a2188f54f8738f232533765a4", | |
| 7059 | + "reference": "f46c7fc8e207bd8a2188f54f8738f232533765a4", | |
| 7060 | 7060 | "shasum": "" |
| 7061 | 7061 | }, |
| 7062 | 7062 | "require": { |
| ... | ... | @@ -7097,7 +7097,7 @@ |
| 7097 | 7097 | "configuration", |
| 7098 | 7098 | "options" |
| 7099 | 7099 | ], |
| 7100 | - "time": "2019-08-08T09:29:19+00:00" | |
| 7100 | + "time": "2019-10-28T20:59:01+00:00" | |
| 7101 | 7101 | }, |
| 7102 | 7102 | { |
| 7103 | 7103 | "name": "symfony/polyfill-php70", |
| ... | ... | @@ -7160,7 +7160,7 @@ |
| 7160 | 7160 | }, |
| 7161 | 7161 | { |
| 7162 | 7162 | "name": "symfony/stopwatch", |
| 7163 | - "version": "v4.3.5", | |
| 7163 | + "version": "v4.3.6", | |
| 7164 | 7164 | "source": { |
| 7165 | 7165 | "type": "git", |
| 7166 | 7166 | "url": "https://github.com/symfony/stopwatch.git", | ... | ... |
docker/php/Dockerfile
| ... | ... | @@ -52,3 +52,6 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local |
| 52 | 52 | COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini |
| 53 | 53 | |
| 54 | 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 | ... | ... |
No preview for this file type
ieducar/intranet/include/clsPDF.inc.php
| ... | ... | @@ -145,7 +145,7 @@ class clsPDF |
| 145 | 145 | // Construção de página normal |
| 146 | 146 | $this->ClosePage(); |
| 147 | 147 | $this->numeroPagina++; |
| 148 | - PDF_begin_page($this->pdf, $this->largura, $this->altura); | |
| 148 | + PDF_begin_page_ext($this->pdf, $this->largura, $this->altura, ""); | |
| 149 | 149 | $this->pagOpened = TRUE; |
| 150 | 150 | } |
| 151 | 151 | else { |
| ... | ... | @@ -372,6 +372,10 @@ class clsPDF |
| 372 | 372 | */ |
| 373 | 373 | public function insertImageScaled($tipo, $image, $x, $y, $maxWidth) |
| 374 | 374 | { |
| 375 | + if ($image == "") { | |
| 376 | + throw new Exception('Parametro $image vazio'); | |
| 377 | + } | |
| 378 | + | |
| 375 | 379 | $image = realpath($image); |
| 376 | 380 | if (! is_readable($image)) { |
| 377 | 381 | throw new Exception('Caminho para arquivo de imagem inválido: "' . $image . '"'); | ... | ... |
ieducar/intranet/include/relatorio.inc.php
| ... | ... | @@ -117,7 +117,11 @@ class relatorios |
| 117 | 117 | $this->pdf->Write( $this->numeroPagina, $this->pdf->largura - $this->margem_direita - 25, 125, 15, 80, $this->fonte_titulo, 10, "#000000", "center" ); |
| 118 | 118 | |
| 119 | 119 | // Insere o brasao da prefeitura |
| 120 | - $image = config('legacy.app.template.pdf.logo', 'imagens/brasao.gif'); | |
| 120 | + $brasaoDefault = 'imagens/nvp_brasao_print.gif'; | |
| 121 | + $image = config('legacy.app.template.pdf.logo', $brasaoDefault); | |
| 122 | + if ($image == '') { | |
| 123 | + $image = $brasaoDefault; | |
| 124 | + } | |
| 121 | 125 | $this->pdf->insertImageScaled("gif", $image, $this->margem_esquerda + 4, |
| 122 | 126 | 74, 45); |
| 123 | 127 | ... | ... |