Download as
Browse Code »

Commit 2f6a523837bcfabdfb754deaf1a38add7c87ada4

Authored by bonot
2 parents 9d868c0b 30a302a0
Exists in 2.9 and in 7 other branches 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8

Merge branch 'master' into issue-6498

Showing 6 changed files with 124 additions and 139 deletions   Show diff stats
composer.json
  Diff comments   View file @2f6a523
... ... @@ -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.8",
  6 + "version": "2.2.10",
7 7 "keywords": [
8 8 "Portabilis",
9 9 "i-Educar"
... ...
composer.lock
  Diff comments   View file @2f6a523
... ... @@ -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": "05f3300a60f7224c9d631a9447757d9d",
  7 + "content-hash": "b809688eaf9970067bfc1abc85b1a398",
8 8 "packages": [
9 9 {
10 10 "name": "aws/aws-sdk-php",
11   - "version": "3.112.14",
  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": "491960b26d7c02d8d9c9c998646d25a99e10fd16"
  15 + "reference": "f91e264e3cbf8ced5c93f5f786c9e0f079926749"
16 16 },
17 17 "dist": {
18 18 "type": "zip",
19   - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/491960b26d7c02d8d9c9c998646d25a99e10fd16",
20   - "reference": "491960b26d7c02d8d9c9c998646d25a99e10fd16",
  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-03T18:12:08+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",
... ... @@ -1863,30 +1863,29 @@
1863 1863 },
1864 1864 {
1865 1865 "name": "markbaker/matrix",
1866   - "version": "1.1.4",
  1866 + "version": "1.2.0",
1867 1867 "source": {
1868 1868 "type": "git",
1869 1869 "url": "https://github.com/MarkBaker/PHPMatrix.git",
1870   - "reference": "6ea97472b5baf12119b4f31f802835b820dd6d64"
  1870 + "reference": "5348c5a67e3b75cd209d70103f916a93b1f1ed21"
1871 1871 },
1872 1872 "dist": {
1873 1873 "type": "zip",
1874   - "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/6ea97472b5baf12119b4f31f802835b820dd6d64",
1875   - "reference": "6ea97472b5baf12119b4f31f802835b820dd6d64",
  1874 + "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/5348c5a67e3b75cd209d70103f916a93b1f1ed21",
  1875 + "reference": "5348c5a67e3b75cd209d70103f916a93b1f1ed21",
1876 1876 "shasum": ""
1877 1877 },
1878 1878 "require": {
1879 1879 "php": "^5.6.0|^7.0.0"
1880 1880 },
1881 1881 "require-dev": {
1882   - "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3",
1883   - "phpcompatibility/php-compatibility": "^8.0",
1884   - "phpdocumentor/phpdocumentor": "2.*",
1885   - "phploc/phploc": "2.*",
1886   - "phpmd/phpmd": "2.*",
1887   - "phpunit/phpunit": "^4.8.35|^5.4.0",
1888   - "sebastian/phpcpd": "2.*",
1889   - "squizlabs/php_codesniffer": "^3.3.0"
  1882 + "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
  1883 + "phpcompatibility/php-compatibility": "dev-master",
  1884 + "phploc/phploc": "^4",
  1885 + "phpmd/phpmd": "dev-master",
  1886 + "phpunit/phpunit": "^5.7",
  1887 + "sebastian/phpcpd": "^3.0",
  1888 + "squizlabs/php_codesniffer": "^3.0@dev"
1890 1889 },
1891 1890 "type": "library",
1892 1891 "autoload": {
... ... @@ -1929,7 +1928,7 @@
1929 1928 "matrix",
1930 1929 "vector"
1931 1930 ],
1932   - "time": "2018-11-04T22:12:12+00:00"
  1931 + "time": "2019-10-06T11:29:25+00:00"
1933 1932 },
1934 1933 {
1935 1934 "name": "monolog/monolog",
... ... @@ -2066,16 +2065,16 @@
2066 2065 },
2067 2066 {
2068 2067 "name": "nesbot/carbon",
2069   - "version": "2.25.0",
  2068 + "version": "2.25.2",
2070 2069 "source": {
2071 2070 "type": "git",
2072 2071 "url": "https://github.com/briannesbitt/Carbon.git",
2073   - "reference": "b70da677101cca7b584c7489770d2677c2733593"
  2072 + "reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f"
2074 2073 },
2075 2074 "dist": {
2076 2075 "type": "zip",
2077   - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/b70da677101cca7b584c7489770d2677c2733593",
2078   - "reference": "b70da677101cca7b584c7489770d2677c2733593",
  2076 + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/443fe5f1498147e0fbc792142b5dc43e2e8a533f",
  2077 + "reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f",
2079 2078 "shasum": ""
2080 2079 },
2081 2080 "require": {
... ... @@ -2129,7 +2128,7 @@
2129 2128 "datetime",
2130 2129 "time"
2131 2130 ],
2132   - "time": "2019-09-30T16:22:22+00:00"
  2131 + "time": "2019-10-14T14:18:59+00:00"
2133 2132 },
2134 2133 {
2135 2134 "name": "nikic/php-parser",
... ... @@ -3139,16 +3138,16 @@
3139 3138 },
3140 3139 {
3141 3140 "name": "symfony/console",
3142   - "version": "v4.3.4",
  3141 + "version": "v4.3.5",
3143 3142 "source": {
3144 3143 "type": "git",
3145 3144 "url": "https://github.com/symfony/console.git",
3146   - "reference": "de63799239b3881b8a08f8481b22348f77ed7b36"
  3145 + "reference": "929ddf360d401b958f611d44e726094ab46a7369"
3147 3146 },
3148 3147 "dist": {
3149 3148 "type": "zip",
3150   - "url": "https://api.github.com/repos/symfony/console/zipball/de63799239b3881b8a08f8481b22348f77ed7b36",
3151   - "reference": "de63799239b3881b8a08f8481b22348f77ed7b36",
  3149 + "url": "https://api.github.com/repos/symfony/console/zipball/929ddf360d401b958f611d44e726094ab46a7369",
  3150 + "reference": "929ddf360d401b958f611d44e726094ab46a7369",
3152 3151 "shasum": ""
3153 3152 },
3154 3153 "require": {
... ... @@ -3210,20 +3209,20 @@
3210 3209 ],
3211 3210 "description": "Symfony Console Component",
3212 3211 "homepage": "https://symfony.com",
3213   - "time": "2019-08-26T08:26:39+00:00"
  3212 + "time": "2019-10-07T12:36:49+00:00"
3214 3213 },
3215 3214 {
3216 3215 "name": "symfony/css-selector",
3217   - "version": "v4.3.4",
  3216 + "version": "v4.3.5",
3218 3217 "source": {
3219 3218 "type": "git",
3220 3219 "url": "https://github.com/symfony/css-selector.git",
3221   - "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03"
  3220 + "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9"
3222 3221 },
3223 3222 "dist": {
3224 3223 "type": "zip",
3225   - "url": "https://api.github.com/repos/symfony/css-selector/zipball/c6e5e2a00db768c92c3ae131532af4e1acc7bd03",
3226   - "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03",
  3224 + "url": "https://api.github.com/repos/symfony/css-selector/zipball/f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9",
  3225 + "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9",
3227 3226 "shasum": ""
3228 3227 },
3229 3228 "require": {
... ... @@ -3263,20 +3262,20 @@
3263 3262 ],
3264 3263 "description": "Symfony CssSelector Component",
3265 3264 "homepage": "https://symfony.com",
3266   - "time": "2019-08-20T14:07:54+00:00"
  3265 + "time": "2019-10-02T08:36:26+00:00"
3267 3266 },
3268 3267 {
3269 3268 "name": "symfony/debug",
3270   - "version": "v4.3.4",
  3269 + "version": "v4.3.5",
3271 3270 "source": {
3272 3271 "type": "git",
3273 3272 "url": "https://github.com/symfony/debug.git",
3274   - "reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced"
  3273 + "reference": "cc5c1efd0edfcfd10b354750594a46b3dd2afbbe"
3275 3274 },
3276 3275 "dist": {
3277 3276 "type": "zip",
3278   - "url": "https://api.github.com/repos/symfony/debug/zipball/afcdea44a2e399c1e4b52246ec8d54c715393ced",
3279   - "reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced",
  3277 + "url": "https://api.github.com/repos/symfony/debug/zipball/cc5c1efd0edfcfd10b354750594a46b3dd2afbbe",
  3278 + "reference": "cc5c1efd0edfcfd10b354750594a46b3dd2afbbe",
3280 3279 "shasum": ""
3281 3280 },
3282 3281 "require": {
... ... @@ -3319,20 +3318,20 @@
3319 3318 ],
3320 3319 "description": "Symfony Debug Component",
3321 3320 "homepage": "https://symfony.com",
3322   - "time": "2019-08-20T14:27:59+00:00"
  3321 + "time": "2019-09-19T15:51:53+00:00"
3323 3322 },
3324 3323 {
3325 3324 "name": "symfony/event-dispatcher",
3326   - "version": "v4.3.4",
  3325 + "version": "v4.3.5",
3327 3326 "source": {
3328 3327 "type": "git",
3329 3328 "url": "https://github.com/symfony/event-dispatcher.git",
3330   - "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2"
  3329 + "reference": "6229f58993e5a157f6096fc7145c0717d0be8807"
3331 3330 },
3332 3331 "dist": {
3333 3332 "type": "zip",
3334   - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/429d0a1451d4c9c4abe1959b2986b88794b9b7d2",
3335   - "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2",
  3333 + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6229f58993e5a157f6096fc7145c0717d0be8807",
  3334 + "reference": "6229f58993e5a157f6096fc7145c0717d0be8807",
3336 3335 "shasum": ""
3337 3336 },
3338 3337 "require": {
... ... @@ -3389,20 +3388,20 @@
3389 3388 ],
3390 3389 "description": "Symfony EventDispatcher Component",
3391 3390 "homepage": "https://symfony.com",
3392   - "time": "2019-08-26T08:55:16+00:00"
  3391 + "time": "2019-10-01T16:40:32+00:00"
3393 3392 },
3394 3393 {
3395 3394 "name": "symfony/event-dispatcher-contracts",
3396   - "version": "v1.1.5",
  3395 + "version": "v1.1.7",
3397 3396 "source": {
3398 3397 "type": "git",
3399 3398 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
3400   - "reference": "c61766f4440ca687de1084a5c00b08e167a2575c"
  3399 + "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
3401 3400 },
3402 3401 "dist": {
3403 3402 "type": "zip",
3404   - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c61766f4440ca687de1084a5c00b08e167a2575c",
3405   - "reference": "c61766f4440ca687de1084a5c00b08e167a2575c",
  3403 + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
  3404 + "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
3406 3405 "shasum": ""
3407 3406 },
3408 3407 "require": {
... ... @@ -3447,20 +3446,20 @@
3447 3446 "interoperability",
3448 3447 "standards"
3449 3448 ],
3450   - "time": "2019-06-20T06:46:26+00:00"
  3449 + "time": "2019-09-17T09:54:03+00:00"
3451 3450 },
3452 3451 {
3453 3452 "name": "symfony/finder",
3454   - "version": "v4.3.4",
  3453 + "version": "v4.3.5",
3455 3454 "source": {
3456 3455 "type": "git",
3457 3456 "url": "https://github.com/symfony/finder.git",
3458   - "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2"
  3457 + "reference": "5e575faa95548d0586f6bedaeabec259714e44d1"
3459 3458 },
3460 3459 "dist": {
3461 3460 "type": "zip",
3462   - "url": "https://api.github.com/repos/symfony/finder/zipball/86c1c929f0a4b24812e1eb109262fc3372c8e9f2",
3463   - "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2",
  3461 + "url": "https://api.github.com/repos/symfony/finder/zipball/5e575faa95548d0586f6bedaeabec259714e44d1",
  3462 + "reference": "5e575faa95548d0586f6bedaeabec259714e44d1",
3464 3463 "shasum": ""
3465 3464 },
3466 3465 "require": {
... ... @@ -3496,20 +3495,20 @@
3496 3495 ],
3497 3496 "description": "Symfony Finder Component",
3498 3497 "homepage": "https://symfony.com",
3499   - "time": "2019-08-14T12:26:46+00:00"
  3498 + "time": "2019-09-16T11:29:48+00:00"
3500 3499 },
3501 3500 {
3502 3501 "name": "symfony/http-foundation",
3503   - "version": "v4.3.4",
  3502 + "version": "v4.3.5",
3504 3503 "source": {
3505 3504 "type": "git",
3506 3505 "url": "https://github.com/symfony/http-foundation.git",
3507   - "reference": "d804bea118ff340a12e22a79f9c7e7eb56b35adc"
  3506 + "reference": "76590ced16d4674780863471bae10452b79210a5"
3508 3507 },
3509 3508 "dist": {
3510 3509 "type": "zip",
3511   - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d804bea118ff340a12e22a79f9c7e7eb56b35adc",
3512   - "reference": "d804bea118ff340a12e22a79f9c7e7eb56b35adc",
  3510 + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/76590ced16d4674780863471bae10452b79210a5",
  3511 + "reference": "76590ced16d4674780863471bae10452b79210a5",
3513 3512 "shasum": ""
3514 3513 },
3515 3514 "require": {
... ... @@ -3551,20 +3550,20 @@
3551 3550 ],
3552 3551 "description": "Symfony HttpFoundation Component",
3553 3552 "homepage": "https://symfony.com",
3554   - "time": "2019-08-26T08:55:16+00:00"
  3553 + "time": "2019-10-04T19:48:13+00:00"
3555 3554 },
3556 3555 {
3557 3556 "name": "symfony/http-kernel",
3558   - "version": "v4.3.4",
  3557 + "version": "v4.3.5",
3559 3558 "source": {
3560 3559 "type": "git",
3561 3560 "url": "https://github.com/symfony/http-kernel.git",
3562   - "reference": "5e0fc71be03d52cd00c423061cfd300bd6f92a52"
  3561 + "reference": "5f08141850932e8019c01d8988bf3ed6367d2991"
3563 3562 },
3564 3563 "dist": {
3565 3564 "type": "zip",
3566   - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5e0fc71be03d52cd00c423061cfd300bd6f92a52",
3567   - "reference": "5e0fc71be03d52cd00c423061cfd300bd6f92a52",
  3565 + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5f08141850932e8019c01d8988bf3ed6367d2991",
  3566 + "reference": "5f08141850932e8019c01d8988bf3ed6367d2991",
3568 3567 "shasum": ""
3569 3568 },
3570 3569 "require": {
... ... @@ -3643,20 +3642,20 @@
3643 3642 ],
3644 3643 "description": "Symfony HttpKernel Component",
3645 3644 "homepage": "https://symfony.com",
3646   - "time": "2019-08-26T16:47:42+00:00"
  3645 + "time": "2019-10-07T15:06:41+00:00"
3647 3646 },
3648 3647 {
3649 3648 "name": "symfony/mime",
3650   - "version": "v4.3.4",
  3649 + "version": "v4.3.5",
3651 3650 "source": {
3652 3651 "type": "git",
3653 3652 "url": "https://github.com/symfony/mime.git",
3654   - "reference": "987a05df1c6ac259b34008b932551353f4f408df"
  3653 + "reference": "32f71570547b91879fdbd9cf50317d556ae86916"
3655 3654 },
3656 3655 "dist": {
3657 3656 "type": "zip",
3658   - "url": "https://api.github.com/repos/symfony/mime/zipball/987a05df1c6ac259b34008b932551353f4f408df",
3659   - "reference": "987a05df1c6ac259b34008b932551353f4f408df",
  3657 + "url": "https://api.github.com/repos/symfony/mime/zipball/32f71570547b91879fdbd9cf50317d556ae86916",
  3658 + "reference": "32f71570547b91879fdbd9cf50317d556ae86916",
3660 3659 "shasum": ""
3661 3660 },
3662 3661 "require": {
... ... @@ -3702,7 +3701,7 @@
3702 3701 "mime",
3703 3702 "mime-type"
3704 3703 ],
3705   - "time": "2019-08-22T08:16:11+00:00"
  3704 + "time": "2019-09-19T17:00:15+00:00"
3706 3705 },
3707 3706 {
3708 3707 "name": "symfony/polyfill-ctype",
... ... @@ -4057,16 +4056,16 @@
4057 4056 },
4058 4057 {
4059 4058 "name": "symfony/process",
4060   - "version": "v4.3.4",
  4059 + "version": "v4.3.5",
4061 4060 "source": {
4062 4061 "type": "git",
4063 4062 "url": "https://github.com/symfony/process.git",
4064   - "reference": "e89969c00d762349f078db1128506f7f3dcc0d4a"
  4063 + "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b"
4065 4064 },
4066 4065 "dist": {
4067 4066 "type": "zip",
4068   - "url": "https://api.github.com/repos/symfony/process/zipball/e89969c00d762349f078db1128506f7f3dcc0d4a",
4069   - "reference": "e89969c00d762349f078db1128506f7f3dcc0d4a",
  4067 + "url": "https://api.github.com/repos/symfony/process/zipball/50556892f3cc47d4200bfd1075314139c4c9ff4b",
  4068 + "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b",
4070 4069 "shasum": ""
4071 4070 },
4072 4071 "require": {
... ... @@ -4102,20 +4101,20 @@
4102 4101 ],
4103 4102 "description": "Symfony Process Component",
4104 4103 "homepage": "https://symfony.com",
4105   - "time": "2019-08-26T08:26:39+00:00"
  4104 + "time": "2019-09-26T21:17:10+00:00"
4106 4105 },
4107 4106 {
4108 4107 "name": "symfony/routing",
4109   - "version": "v4.3.4",
  4108 + "version": "v4.3.5",
4110 4109 "source": {
4111 4110 "type": "git",
4112 4111 "url": "https://github.com/symfony/routing.git",
4113   - "reference": "ff1049f6232dc5b6023b1ff1c6de56f82bcd264f"
  4112 + "reference": "3b174ef04fe66696524efad1e5f7a6c663d822ea"
4114 4113 },
4115 4114 "dist": {
4116 4115 "type": "zip",
4117   - "url": "https://api.github.com/repos/symfony/routing/zipball/ff1049f6232dc5b6023b1ff1c6de56f82bcd264f",
4118   - "reference": "ff1049f6232dc5b6023b1ff1c6de56f82bcd264f",
  4116 + "url": "https://api.github.com/repos/symfony/routing/zipball/3b174ef04fe66696524efad1e5f7a6c663d822ea",
  4117 + "reference": "3b174ef04fe66696524efad1e5f7a6c663d822ea",
4119 4118 "shasum": ""
4120 4119 },
4121 4120 "require": {
... ... @@ -4178,20 +4177,20 @@
4178 4177 "uri",
4179 4178 "url"
4180 4179 ],
4181   - "time": "2019-08-26T08:26:39+00:00"
  4180 + "time": "2019-10-04T20:57:10+00:00"
4182 4181 },
4183 4182 {
4184 4183 "name": "symfony/service-contracts",
4185   - "version": "v1.1.6",
  4184 + "version": "v1.1.7",
4186 4185 "source": {
4187 4186 "type": "git",
4188 4187 "url": "https://github.com/symfony/service-contracts.git",
4189   - "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3"
  4188 + "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0"
4190 4189 },
4191 4190 "dist": {
4192 4191 "type": "zip",
4193   - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ea7263d6b6d5f798b56a45a5b8d686725f2719a3",
4194   - "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3",
  4192 + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffcde9615dc5bb4825b9f6aed07716f1f57faae0",
  4193 + "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0",
4195 4194 "shasum": ""
4196 4195 },
4197 4196 "require": {
... ... @@ -4236,20 +4235,20 @@
4236 4235 "interoperability",
4237 4236 "standards"
4238 4237 ],
4239   - "time": "2019-08-20T14:44:19+00:00"
  4238 + "time": "2019-09-17T11:12:18+00:00"
4240 4239 },
4241 4240 {
4242 4241 "name": "symfony/translation",
4243   - "version": "v4.3.4",
  4242 + "version": "v4.3.5",
4244 4243 "source": {
4245 4244 "type": "git",
4246 4245 "url": "https://github.com/symfony/translation.git",
4247   - "reference": "28498169dd334095fa981827992f3a24d50fed0f"
  4246 + "reference": "fe6193b066c457c144333c06aaa869a2d42a167f"
4248 4247 },
4249 4248 "dist": {
4250 4249 "type": "zip",
4251   - "url": "https://api.github.com/repos/symfony/translation/zipball/28498169dd334095fa981827992f3a24d50fed0f",
4252   - "reference": "28498169dd334095fa981827992f3a24d50fed0f",
  4250 + "url": "https://api.github.com/repos/symfony/translation/zipball/fe6193b066c457c144333c06aaa869a2d42a167f",
  4251 + "reference": "fe6193b066c457c144333c06aaa869a2d42a167f",
4253 4252 "shasum": ""
4254 4253 },
4255 4254 "require": {
... ... @@ -4312,20 +4311,20 @@
4312 4311 ],
4313 4312 "description": "Symfony Translation Component",
4314 4313 "homepage": "https://symfony.com",
4315   - "time": "2019-08-26T08:55:16+00:00"
  4314 + "time": "2019-09-27T14:37:39+00:00"
4316 4315 },
4317 4316 {
4318 4317 "name": "symfony/translation-contracts",
4319   - "version": "v1.1.6",
  4318 + "version": "v1.1.7",
4320 4319 "source": {
4321 4320 "type": "git",
4322 4321 "url": "https://github.com/symfony/translation-contracts.git",
4323   - "reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a"
  4322 + "reference": "364518c132c95642e530d9b2d217acbc2ccac3e6"
4324 4323 },
4325 4324 "dist": {
4326 4325 "type": "zip",
4327   - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/325b17c24f3ee23cbecfa63ba809c6d89b5fa04a",
4328   - "reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a",
  4326 + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/364518c132c95642e530d9b2d217acbc2ccac3e6",
  4327 + "reference": "364518c132c95642e530d9b2d217acbc2ccac3e6",
4329 4328 "shasum": ""
4330 4329 },
4331 4330 "require": {
... ... @@ -4369,20 +4368,20 @@
4369 4368 "interoperability",
4370 4369 "standards"
4371 4370 ],
4372   - "time": "2019-08-02T12:15:04+00:00"
  4371 + "time": "2019-09-17T11:12:18+00:00"
4373 4372 },
4374 4373 {
4375 4374 "name": "symfony/var-dumper",
4376   - "version": "v4.3.4",
  4375 + "version": "v4.3.5",
4377 4376 "source": {
4378 4377 "type": "git",
4379 4378 "url": "https://github.com/symfony/var-dumper.git",
4380   - "reference": "641043e0f3e615990a0f29479f9c117e8a6698c6"
  4379 + "reference": "bde8957fc415fdc6964f33916a3755737744ff05"
4381 4380 },
4382 4381 "dist": {
4383 4382 "type": "zip",
4384   - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/641043e0f3e615990a0f29479f9c117e8a6698c6",
4385   - "reference": "641043e0f3e615990a0f29479f9c117e8a6698c6",
  4383 + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/bde8957fc415fdc6964f33916a3755737744ff05",
  4384 + "reference": "bde8957fc415fdc6964f33916a3755737744ff05",
4386 4385 "shasum": ""
4387 4386 },
4388 4387 "require": {
... ... @@ -4445,7 +4444,7 @@
4445 4444 "debug",
4446 4445 "dump"
4447 4446 ],
4448   - "time": "2019-08-26T08:26:39+00:00"
  4447 + "time": "2019-10-04T19:48:13+00:00"
4449 4448 },
4450 4449 {
4451 4450 "name": "tijsverkoyen/css-to-inline-styles",
... ... @@ -5338,25 +5337,25 @@
5338 5337 },
5339 5338 {
5340 5339 "name": "maximebf/debugbar",
5341   - "version": "v1.15.0",
  5340 + "version": "v1.15.1",
5342 5341 "source": {
5343 5342 "type": "git",
5344 5343 "url": "https://github.com/maximebf/php-debugbar.git",
5345   - "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07"
  5344 + "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e"
5346 5345 },
5347 5346 "dist": {
5348 5347 "type": "zip",
5349   - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30e7d60937ee5f1320975ca9bc7bcdd44d500f07",
5350   - "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07",
  5348 + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6c4277f6117e4864966c9cb58fb835cee8c74a1e",
  5349 + "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e",
5351 5350 "shasum": ""
5352 5351 },
5353 5352 "require": {
5354   - "php": ">=5.3.0",
  5353 + "php": ">=5.6",
5355 5354 "psr/log": "^1.0",
5356   - "symfony/var-dumper": "^2.6|^3.0|^4.0"
  5355 + "symfony/var-dumper": "^2.6|^3|^4"
5357 5356 },
5358 5357 "require-dev": {
5359   - "phpunit/phpunit": "^4.0|^5.0"
  5358 + "phpunit/phpunit": "^5"
5360 5359 },
5361 5360 "suggest": {
5362 5361 "kriswallsmith/assetic": "The best way to manage assets",
... ... @@ -5366,7 +5365,7 @@
5366 5365 "type": "library",
5367 5366 "extra": {
5368 5367 "branch-alias": {
5369   - "dev-master": "1.14-dev"
  5368 + "dev-master": "1.15-dev"
5370 5369 }
5371 5370 },
5372 5371 "autoload": {
... ... @@ -5395,7 +5394,7 @@
5395 5394 "debug",
5396 5395 "debugbar"
5397 5396 ],
5398   - "time": "2017-12-15T11:13:46+00:00"
  5397 + "time": "2019-09-24T14:55:42+00:00"
5399 5398 },
5400 5399 {
5401 5400 "name": "mockery/mockery",
... ... @@ -6893,7 +6892,7 @@
6893 6892 },
6894 6893 {
6895 6894 "name": "symfony/filesystem",
6896   - "version": "v4.3.4",
  6895 + "version": "v4.3.5",
6897 6896 "source": {
6898 6897 "type": "git",
6899 6898 "url": "https://github.com/symfony/filesystem.git",
... ... @@ -6943,7 +6942,7 @@
6943 6942 },
6944 6943 {
6945 6944 "name": "symfony/options-resolver",
6946   - "version": "v4.3.4",
  6945 + "version": "v4.3.5",
6947 6946 "source": {
6948 6947 "type": "git",
6949 6948 "url": "https://github.com/symfony/options-resolver.git",
... ... @@ -7056,7 +7055,7 @@
7056 7055 },
7057 7056 {
7058 7057 "name": "symfony/stopwatch",
7059   - "version": "v4.3.4",
  7058 + "version": "v4.3.5",
7060 7059 "source": {
7061 7060 "type": "git",
7062 7061 "url": "https://github.com/symfony/stopwatch.git",
... ...
ieducar/intranet/educar_usuario_det.php
  Diff comments   View file @2f6a523
... ... @@ -38,9 +38,9 @@ class indice extends clsDetalhe
38 38  
39 39 $this->addDetalhe(['Nome', $det_pessoa['nome']]);
40 40  
41   - $obj_fisica_cpf = new clsFisica($cod_pessoa);
42   - $det_fisica_cpf = $obj_fisica_cpf->detalhe();
43   - $this->addDetalhe(['CPF', int2CPF($det_fisica_cpf['cpf'])]);
  41 + $obj_fisica = new clsFisica($cod_pessoa);
  42 + $det_fisica = $obj_fisica->detalhe();
  43 + $this->addDetalhe(['CPF', int2CPF($det_fisica['cpf'])]);
44 44  
45 45 $obj_funcionario = new clsFuncionario($cod_pessoa);
46 46 $det_funcionario = $obj_funcionario->detalhe();
... ...
ieducar/intranet/include/pessoa/clsFuncionario.inc.php
  Diff comments   View file @2f6a523
... ... @@ -24,8 +24,6 @@ class clsFuncionario extends clsPessoaFisica
24 24 public $schema_cadastro = 'cadastro';
25 25 public $schema_portal = 'portal';
26 26 public $tabela_pessoa = 'pessoa';
27   - public $tabela_funcionario = 'funcionario';
28   - public $tabela_fisica_cpf = 'fisica';
29 27  
30 28 public function __construct($int_idpes = false, $str_matricula = false, $int_cpf = false, $int_ref_cod_setor = false, $str_senha = false, $data_troca_senha = false, $tempo_expira_senha = false, $data_reativa_conta = false, $tempo_expira_conta = false, $ref_cod_funcionario_vinculo = false, $ramal = false, $matricula_permanente = false, $banido = false, $email = null)
31 29 {
... ...
ieducar/lib/App/Model/IedFinder.php
  Diff comments   View file @2f6a523
... ... @@ -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  
... ...
ieducar/lib/App/Unificacao/Pessoa.php
  Diff comments   View file @2f6a523
... ... @@ -22,10 +22,6 @@ class App_Unificacao_Pessoa extends App_Unificacao_Base
22 22 'coluna' => 'idpes'
23 23 ],
24 24 [
25   - 'tabela' => 'cadastro.fisica_cpf',
26   - 'coluna' => 'idpes'
27   - ],
28   - [
29 25 'tabela' => 'cadastro.fisica_foto',
30 26 'coluna' => 'idpes'
31 27 ],
... ... @@ -97,14 +93,6 @@ class App_Unificacao_Pessoa extends App_Unificacao_Base
97 93 'coluna' => 'idpes_cad'
98 94 ],
99 95 [
100   - 'tabela' => 'cadastro.fisica_cpf',
101   - 'coluna' => 'idpes_rev'
102   - ],
103   - [
104   - 'tabela' => 'cadastro.fisica_cpf',
105   - 'coluna' => 'idpes_cad'
106   - ],
107   - [
108 96 'tabela' => 'cadastro.fone_pessoa',
109 97 'coluna' => 'idpes_rev'
110 98 ],
... ...