diff --git a/airwatch.xml b/airwatch.xml index fd8df54..d0505bb 100644 --- a/airwatch.xml +++ b/airwatch.xml @@ -25,6 +25,12 @@ Walid Nouh + + 1.4.1 + 9.2 + 9.3 + 9.4 + 1.4.0 9.2 diff --git a/composer.lock b/composer.lock index 583be70..a716401 100644 --- a/composer.lock +++ b/composer.lock @@ -9,34 +9,78 @@ "packages-dev": [ { "name": "consolidation/annotated-command", - "version": "2.10.0", + "version": "2.12.0", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "8e7d1a05230dc1159c751809e98b74f2b7f71873" + "reference": "512a2e54c98f3af377589de76c43b24652bcb789" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/8e7d1a05230dc1159c751809e98b74f2b7f71873", - "reference": "8e7d1a05230dc1159c751809e98b74f2b7f71873", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789", + "reference": "512a2e54c98f3af377589de76c43b24652bcb789", "shasum": "" }, "require": { "consolidation/output-formatters": "^3.4", - "php": ">=5.4.0", + "php": ">=5.4.5", "psr/log": "^1", "symfony/console": "^2.8|^3|^4", "symfony/event-dispatcher": "^2.5|^3|^4", "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "g1a/composer-test-scenarios": "^2", + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", "phpunit/phpunit": "^6", - "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "^2.7" }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require": { + "symfony/console": "^4.0" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require": { + "symfony/console": "^2.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + }, + "scenario-options": { + "create-lockfile": "false" + } + }, + "phpunit4": { + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + } + }, "branch-alias": { "dev-master": "2.x-dev" } @@ -57,20 +101,20 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2018-11-15T01:46:18+00:00" + "time": "2019-03-08T16:55:03+00:00" }, { "name": "consolidation/config", - "version": "1.1.1", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/consolidation/config.git", - "reference": "925231dfff32f05b787e1fddb265e789b939cf4c" + "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/config/zipball/925231dfff32f05b787e1fddb265e789b939cf4c", - "reference": "925231dfff32f05b787e1fddb265e789b939cf4c", + "url": "https://api.github.com/repos/consolidation/config/zipball/cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1", + "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1", "shasum": "" }, "require": { @@ -79,9 +123,9 @@ "php": ">=5.4.0" }, "require-dev": { - "g1a/composer-test-scenarios": "^1", + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", "phpunit/phpunit": "^5", - "satooshi/php-coveralls": "^1.0", "squizlabs/php_codesniffer": "2.*", "symfony/console": "^2.5|^3|^4", "symfony/yaml": "^2.8.11|^3|^4" @@ -91,6 +135,33 @@ }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require-dev": { + "symfony/console": "^4.0" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require-dev": { + "symfony/console": "^2.8", + "symfony/event-dispatcher": "^2.8", + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + } + }, "branch-alias": { "dev-master": "1.x-dev" } @@ -111,35 +182,76 @@ } ], "description": "Provide configuration services for a commandline tool.", - "time": "2018-10-24T17:55:35+00:00" + "time": "2019-03-03T19:37:04+00:00" }, { "name": "consolidation/log", - "version": "1.0.6", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/consolidation/log.git", - "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395" + "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395", - "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395", + "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a", + "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a", "shasum": "" }, "require": { - "php": ">=5.5.0", - "psr/log": "~1.0", + "php": ">=5.4.5", + "psr/log": "^1.0", "symfony/console": "^2.8|^3|^4" }, "require-dev": { - "g1a/composer-test-scenarios": "^1", - "phpunit/phpunit": "4.*", - "satooshi/php-coveralls": "^2", - "squizlabs/php_codesniffer": "2.*" + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", + "phpunit/phpunit": "^6", + "squizlabs/php_codesniffer": "^2" }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require": { + "symfony/console": "^4.0" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require": { + "symfony/console": "^2.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + }, + "phpunit4": { + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + } + }, "branch-alias": { "dev-master": "1.x-dev" } @@ -160,20 +272,20 @@ } ], "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.", - "time": "2018-05-25T18:14:39+00:00" + "time": "2019-01-01T17:30:51+00:00" }, { "name": "consolidation/output-formatters", - "version": "3.4.0", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19" + "reference": "99ec998ffb697e0eada5aacf81feebfb13023605" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/a942680232094c4a5b21c0b7e54c20cce623ae19", - "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/99ec998ffb697e0eada5aacf81feebfb13023605", + "reference": "99ec998ffb697e0eada5aacf81feebfb13023605", "shasum": "" }, "require": { @@ -183,11 +295,10 @@ "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "g1a/composer-test-scenarios": "^2", + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", "phpunit/phpunit": "^5.7.27", - "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "^2.7", - "symfony/console": "3.2.3", "symfony/var-dumper": "^2.8|^3|^4", "victorjonsson/markdowndocs": "^1.3" }, @@ -196,6 +307,52 @@ }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require": { + "symfony/console": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^6" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony3": { + "require": { + "symfony/console": "^3.4", + "symfony/finder": "^3.4", + "symfony/var-dumper": "^3.4" + }, + "config": { + "platform": { + "php": "5.6.32" + } + } + }, + "symfony2": { + "require": { + "symfony/console": "^2.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + }, + "scenario-options": { + "create-lockfile": "false" + } + } + }, "branch-alias": { "dev-master": "3.x-dev" } @@ -216,25 +373,25 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2018-10-19T22:35:38+00:00" + "time": "2019-05-30T23:16:01+00:00" }, { "name": "consolidation/robo", - "version": "1.3.2", + "version": "1.4.11", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "a9bd9ecf00751aa92754903c0d17612c4e840ce8" + "reference": "5fa1d901776a628167a325baa9db95d8edf13a80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/a9bd9ecf00751aa92754903c0d17612c4e840ce8", - "reference": "a9bd9ecf00751aa92754903c0d17612c4e840ce8", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/5fa1d901776a628167a325baa9db95d8edf13a80", + "reference": "5fa1d901776a628167a325baa9db95d8edf13a80", "shasum": "" }, "require": { - "consolidation/annotated-command": "^2.8.2", - "consolidation/config": "^1.0.10", + "consolidation/annotated-command": "^2.11.0", + "consolidation/config": "^1.2", "consolidation/log": "~1", "consolidation/output-formatters": "^3.1.13", "consolidation/self-update": "^1", @@ -260,9 +417,10 @@ "natxet/cssmin": "3.0.4", "nikic/php-parser": "^3.1.5", "patchwork/jsqueeze": "~2", - "pear/archive_tar": "^1.4.2", + "pear/archive_tar": "^1.4.4", "php-coveralls/php-coveralls": "^1", "phpunit/php-code-coverage": "~2|~4", + "sebastian/comparator": "^1.2.4", "squizlabs/php_codesniffer": "^2.8" }, "suggest": { @@ -305,7 +463,7 @@ } }, "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -324,7 +482,7 @@ } ], "description": "Modern task runner", - "time": "2018-11-22T05:43:44+00:00" + "time": "2019-10-29T15:50:02+00:00" }, { "name": "consolidation/self-update", @@ -468,20 +626,20 @@ }, { "name": "glpi-project/coding-standard", - "version": "0.7.1", + "version": "0.7.2", "source": { "type": "git", "url": "https://github.com/glpi-project/coding-standard.git", - "reference": "1cef37d764aecf8fd7d5d167db25da97e289cb03" + "reference": "dbba6566e1ce7f7d0778794cd6e93bc07080c8c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/coding-standard/zipball/1cef37d764aecf8fd7d5d167db25da97e289cb03", - "reference": "1cef37d764aecf8fd7d5d167db25da97e289cb03", + "url": "https://api.github.com/repos/glpi-project/coding-standard/zipball/dbba6566e1ce7f7d0778794cd6e93bc07080c8c7", + "reference": "dbba6566e1ce7f7d0778794cd6e93bc07080c8c7", "shasum": "" }, "require": { - "squizlabs/php_codesniffer": "^3.3" + "squizlabs/php_codesniffer": "^3.5" }, "type": "library", "notification-url": "https://packagist.org/downloads/", @@ -501,20 +659,20 @@ "glpi", "phpcs" ], - "time": "2018-06-07T08:45:05+00:00" + "time": "2019-10-31T10:30:33+00:00" }, { "name": "glpi-project/tools", - "version": "0.1.5", + "version": "0.1.8", "source": { "type": "git", "url": "https://github.com/glpi-project/tools.git", - "reference": "5ff99fa5967b468af3d3ba2d7a69ede1214273ea" + "reference": "39ca503a00454e6c5d7d97bd8baff358d262a897" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/tools/zipball/5ff99fa5967b468af3d3ba2d7a69ede1214273ea", - "reference": "5ff99fa5967b468af3d3ba2d7a69ede1214273ea", + "url": "https://api.github.com/repos/glpi-project/tools/zipball/39ca503a00454e6c5d7d97bd8baff358d262a897", + "reference": "39ca503a00454e6c5d7d97bd8baff358d262a897", "shasum": "" }, "require": { @@ -551,7 +709,7 @@ "plugins", "tools" ], - "time": "2018-06-21T11:59:33+00:00" + "time": "2019-06-07T09:46:17+00:00" }, { "name": "grasmash/expander", @@ -853,16 +1011,16 @@ }, { "name": "psr/log", - "version": "1.1.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", "shasum": "" }, "require": { @@ -871,7 +1029,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -896,20 +1054,20 @@ "psr", "psr-3" ], - "time": "2018-11-20T15:27:04+00:00" + "time": "2019-11-01T11:05:21+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.3.2", + "version": "3.5.4", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e" + "reference": "dceec07328401de6211037abbb18bda423677e26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6ad28354c04b364c3c71a34e4a18b629cc3b231e", - "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dceec07328401de6211037abbb18bda423677e26", + "reference": "dceec07328401de6211037abbb18bda423677e26", "shasum": "" }, "require": { @@ -942,25 +1100,25 @@ } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "http://www.squizlabs.com/php-codesniffer", + "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", "keywords": [ "phpcs", "standards" ], - "time": "2018-09-23T23:08:17+00:00" + "time": "2020-01-30T22:20:29+00:00" }, { "name": "symfony/console", - "version": "v3.4.20", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb" + "reference": "7c5bdd346f9d90a2d22d4e1fe61e02dc19b98f12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb", - "reference": "8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb", + "url": "https://api.github.com/repos/symfony/console/zipball/7c5bdd346f9d90a2d22d4e1fe61e02dc19b98f12", + "reference": "7c5bdd346f9d90a2d22d4e1fe61e02dc19b98f12", "shasum": "" }, "require": { @@ -972,6 +1130,9 @@ "symfony/dependency-injection": "<3.4", "symfony/process": "<3.3" }, + "provide": { + "psr/log-implementation": "1.0" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~3.3|~4.0", @@ -981,7 +1142,7 @@ "symfony/process": "~3.3|~4.0" }, "suggest": { - "psr/log-implementation": "For using the console logger", + "psr/log": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -1016,20 +1177,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-11-26T12:48:07+00:00" + "time": "2020-01-10T07:52:48+00:00" }, { "name": "symfony/debug", - "version": "v3.4.20", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "a2233f555ddf55e5600f386fba7781cea1cb82d3" + "reference": "70dd18e93bb8bdf3c4db7fde832619fef9828cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/a2233f555ddf55e5600f386fba7781cea1cb82d3", - "reference": "a2233f555ddf55e5600f386fba7781cea1cb82d3", + "url": "https://api.github.com/repos/symfony/debug/zipball/70dd18e93bb8bdf3c4db7fde832619fef9828cf8", + "reference": "70dd18e93bb8bdf3c4db7fde832619fef9828cf8", "shasum": "" }, "require": { @@ -1072,20 +1233,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-11-27T12:43:10+00:00" + "time": "2020-01-08T16:36:15+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.20", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "cc35e84adbb15c26ae6868e1efbf705a917be6b5" + "reference": "79ede8f2836e5ec910ebb325bde40f987244baa8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/cc35e84adbb15c26ae6868e1efbf705a917be6b5", - "reference": "cc35e84adbb15c26ae6868e1efbf705a917be6b5", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/79ede8f2836e5ec910ebb325bde40f987244baa8", + "reference": "79ede8f2836e5ec910ebb325bde40f987244baa8", "shasum": "" }, "require": { @@ -1135,20 +1296,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-11-30T18:07:24+00:00" + "time": "2020-01-04T12:05:51+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.20", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "b49b1ca166bd109900e6a1683d9bb1115727ef2d" + "reference": "0a0d3b4bda11aa3a0464531c40e681e184e75628" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/b49b1ca166bd109900e6a1683d9bb1115727ef2d", - "reference": "b49b1ca166bd109900e6a1683d9bb1115727ef2d", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0a0d3b4bda11aa3a0464531c40e681e184e75628", + "reference": "0a0d3b4bda11aa3a0464531c40e681e184e75628", "shasum": "" }, "require": { @@ -1185,20 +1346,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:48:54+00:00" + "time": "2020-01-17T08:50:08+00:00" }, { "name": "symfony/finder", - "version": "v3.4.20", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442" + "reference": "a90a9d3b9f458a5cdeabfa4090b20c000ca3962f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442", - "reference": "6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442", + "url": "https://api.github.com/repos/symfony/finder/zipball/a90a9d3b9f458a5cdeabfa4090b20c000ca3962f", + "reference": "a90a9d3b9f458a5cdeabfa4090b20c000ca3962f", "shasum": "" }, "require": { @@ -1234,20 +1395,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:48:54+00:00" + "time": "2020-01-01T11:03:25+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.10.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" + "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", + "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", "shasum": "" }, "require": { @@ -1259,7 +1420,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -1275,13 +1436,13 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - }, { "name": "Gert de Pagter", "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony polyfill for ctype functions", @@ -1292,20 +1453,20 @@ "polyfill", "portable" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2019-11-27T13:56:44+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.10.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "c79c051f5b3a46be09205c73b80b346e4153e494" + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494", - "reference": "c79c051f5b3a46be09205c73b80b346e4153e494", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", "shasum": "" }, "require": { @@ -1317,7 +1478,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -1351,20 +1512,20 @@ "portable", "shim" ], - "time": "2018-09-21T13:07:52+00:00" + "time": "2019-11-27T14:18:11+00:00" }, { "name": "symfony/process", - "version": "v3.4.20", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2" + "reference": "5b9d2bcffe4678911a4c941c00b7c161252cf09a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2", - "reference": "abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2", + "url": "https://api.github.com/repos/symfony/process/zipball/5b9d2bcffe4678911a4c941c00b7c161252cf09a", + "reference": "5b9d2bcffe4678911a4c941c00b7c161252cf09a", "shasum": "" }, "require": { @@ -1400,20 +1561,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-11-20T16:10:26+00:00" + "time": "2020-01-01T11:03:25+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.20", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "291e13d808bec481eab83f301f7bff3e699ef603" + "reference": "aa46bc2233097d5212332c907f9911533acfbf80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/291e13d808bec481eab83f301f7bff3e699ef603", - "reference": "291e13d808bec481eab83f301f7bff3e699ef603", + "url": "https://api.github.com/repos/symfony/yaml/zipball/aa46bc2233097d5212332c907f9911533acfbf80", + "reference": "aa46bc2233097d5212332c907f9911533acfbf80", "shasum": "" }, "require": { @@ -1459,7 +1620,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:48:54+00:00" + "time": "2020-01-13T08:00:59+00:00" } ], "aliases": [], diff --git a/inc/config.class.php b/inc/config.class.php index ece5444..f93b89a 100644 --- a/inc/config.class.php +++ b/inc/config.class.php @@ -76,6 +76,8 @@ public function showForm() { echo ""; echo "" . __("Username", "airwatch") . ""; echo ""; + // FIXME This is a credential field so it is not in autocomplete whitelist + // Replace with a simple text input. Html::autocompletionTextField($this, "username"); echo ""; echo ""; @@ -83,6 +85,8 @@ public function showForm() { echo ""; echo "" . __("Password", "airwatch") . ""; echo ""; + // FIXME This is a credential field so it is not in autocomplete whitelist + // Replace with a password text input, crypt it, and handle ability to "blank" it. Html::autocompletionTextField($this, "password"); echo ""; echo ""; @@ -90,6 +94,8 @@ public function showForm() { echo ""; echo "" . __("API Key", "airwatch") . ""; echo ""; + // FIXME This is a credential field so it is not in autocomplete whitelist + // Replace with a simple text input. Html::autocompletionTextField($this, "api_key"); echo ""; echo ""; @@ -161,4 +167,46 @@ public static function uninstall() { global $DB; $DB->query("DROP TABLE IF EXISTS `glpi_plugin_airwatch_configs`"); } + + function rawSearchOptions() { + + $tab = []; + + $tab[] = [ + 'id' => 'common', + 'name' => __('Characteristics') + ]; + + $tab[] = [ + 'id' => '2', + 'table' => $this->getTable(), + 'field' => 'fusioninventory_url', + 'name' => __('Service URL', 'fusioninventory'), + 'datatype' => 'string', + 'massiveaction' => false, + 'autocomplete' => true, + ]; + + $tab[] = [ + 'id' => '3', + 'table' => $this->getTable(), + 'field' => 'airwatch_service_url', + 'name' => __('Airwatch Service URL', 'airwatch'), + 'datatype' => 'string', + 'massiveaction' => false, + 'autocomplete' => true, + ]; + + $tab[] = [ + 'id' => '4', + 'table' => $this->getTable(), + 'field' => 'airwatch_console_url', + 'name' => __('Airwatch Console URL', 'airwatch'), + 'datatype' => 'string', + 'massiveaction' => false, + 'autocomplete' => true, + ]; + + return $tab; + } } diff --git a/locales/airwatch.pot b/locales/airwatch.pot index d7d4793..d1249f8 100644 --- a/locales/airwatch.pot +++ b/locales/airwatch.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-20 10:01+0000\n" +"POT-Creation-Date: 2020-02-06 14:44+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -104,15 +104,15 @@ msgstr "" msgid "Plugin configuration" msgstr "" -#: inc/config.class.php:56 +#: inc/config.class.php:56 inc/config.class.php:184 msgid "Service URL" msgstr "" -#: inc/config.class.php:63 +#: inc/config.class.php:63 inc/config.class.php:194 msgid "Airwatch Service URL" msgstr "" -#: inc/config.class.php:70 +#: inc/config.class.php:70 inc/config.class.php:204 msgid "Airwatch Console URL" msgstr "" @@ -120,15 +120,15 @@ msgstr "" msgid "Username" msgstr "" -#: inc/config.class.php:84 +#: inc/config.class.php:86 msgid "Password" msgstr "" -#: inc/config.class.php:91 +#: inc/config.class.php:95 msgid "API Key" msgstr "" -#: inc/config.class.php:98 +#: inc/config.class.php:104 msgid "Skip SSL check" msgstr "" diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo index b823bd8..fa42469 100644 Binary files a/locales/cs_CZ.mo and b/locales/cs_CZ.mo differ diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po index c273701..f853750 100644 --- a/locales/cs_CZ.po +++ b/locales/cs_CZ.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPi Plugin - Airwatch\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-20 10:01+0000\n" +"POT-Creation-Date: 2020-02-06 14:44+0000\n" "PO-Revision-Date: 2018-04-10 12:31+0000\n" "Last-Translator: Pavel Borecki \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-plugin-airwatch/language/cs_CZ/)\n" @@ -106,15 +106,15 @@ msgstr "Napojení GLPi na Airwatch" msgid "Plugin configuration" msgstr "Nastavení zásuvného modulu" -#: inc/config.class.php:56 +#: inc/config.class.php:56 inc/config.class.php:184 msgid "Service URL" msgstr "URL adresa služby" -#: inc/config.class.php:63 +#: inc/config.class.php:63 inc/config.class.php:194 msgid "Airwatch Service URL" msgstr "URL adresa služby Airwatch" -#: inc/config.class.php:70 +#: inc/config.class.php:70 inc/config.class.php:204 msgid "Airwatch Console URL" msgstr "URL adresa Airwatch konzole" @@ -122,15 +122,15 @@ msgstr "URL adresa Airwatch konzole" msgid "Username" msgstr "Uživatelské jméno" -#: inc/config.class.php:84 +#: inc/config.class.php:86 msgid "Password" msgstr "Heslo" -#: inc/config.class.php:91 +#: inc/config.class.php:95 msgid "API Key" msgstr "Klíč k API" -#: inc/config.class.php:98 +#: inc/config.class.php:104 msgid "Skip SSL check" msgstr "Přeskočit kontrolu SSL" diff --git a/locales/en_GB.mo b/locales/en_GB.mo index 78e9b66..b8f5c24 100644 Binary files a/locales/en_GB.mo and b/locales/en_GB.mo differ diff --git a/locales/en_GB.po b/locales/en_GB.po index 3d436c9..3951bca 100644 --- a/locales/en_GB.po +++ b/locales/en_GB.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPi Plugin - Airwatch\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-20 10:01+0000\n" +"POT-Creation-Date: 2020-02-06 14:44+0000\n" "PO-Revision-Date: 2017-09-23 22:26+0000\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/teclib/glpi-plugin-airwatch/language/en_GB/)\n" @@ -106,15 +106,15 @@ msgstr "GLPi Airwatch Connector" msgid "Plugin configuration" msgstr "Plugin configuration" -#: inc/config.class.php:56 +#: inc/config.class.php:56 inc/config.class.php:184 msgid "Service URL" msgstr "Service URL" -#: inc/config.class.php:63 +#: inc/config.class.php:63 inc/config.class.php:194 msgid "Airwatch Service URL" msgstr "Airwatch Service URL" -#: inc/config.class.php:70 +#: inc/config.class.php:70 inc/config.class.php:204 msgid "Airwatch Console URL" msgstr "Airwatch Console URL" @@ -122,15 +122,15 @@ msgstr "Airwatch Console URL" msgid "Username" msgstr "Username" -#: inc/config.class.php:84 +#: inc/config.class.php:86 msgid "Password" msgstr "Password" -#: inc/config.class.php:91 +#: inc/config.class.php:95 msgid "API Key" msgstr "API Key" -#: inc/config.class.php:98 +#: inc/config.class.php:104 msgid "Skip SSL check" msgstr "Skip SSL check" diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo index 2018006..e3db53e 100644 Binary files a/locales/fr_FR.mo and b/locales/fr_FR.mo differ diff --git a/locales/fr_FR.po b/locales/fr_FR.po index dc09128..f14640c 100644 --- a/locales/fr_FR.po +++ b/locales/fr_FR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPi Plugin - Airwatch\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-20 10:01+0000\n" +"POT-Creation-Date: 2020-02-06 14:44+0000\n" "PO-Revision-Date: 2017-09-23 22:26+0000\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: French (France) (http://www.transifex.com/teclib/glpi-plugin-airwatch/language/fr_FR/)\n" @@ -107,15 +107,15 @@ msgstr "Connecteur Airwatch pour GLPi" msgid "Plugin configuration" msgstr "Configuration du plugin" -#: inc/config.class.php:56 +#: inc/config.class.php:56 inc/config.class.php:184 msgid "Service URL" msgstr "URL du service" -#: inc/config.class.php:63 +#: inc/config.class.php:63 inc/config.class.php:194 msgid "Airwatch Service URL" msgstr "URL du service Airwatch" -#: inc/config.class.php:70 +#: inc/config.class.php:70 inc/config.class.php:204 msgid "Airwatch Console URL" msgstr "URL de la console Airwatch" @@ -123,15 +123,15 @@ msgstr "URL de la console Airwatch" msgid "Username" msgstr "Nom d'utilisateur" -#: inc/config.class.php:84 +#: inc/config.class.php:86 msgid "Password" msgstr "Mot de passe" -#: inc/config.class.php:91 +#: inc/config.class.php:95 msgid "API Key" msgstr "Clef d'API" -#: inc/config.class.php:98 +#: inc/config.class.php:104 msgid "Skip SSL check" msgstr "Passer les vérifications SSL" diff --git a/locales/pt_PT.mo b/locales/pt_PT.mo new file mode 100644 index 0000000..4ba2da3 Binary files /dev/null and b/locales/pt_PT.mo differ diff --git a/locales/pt_PT.po b/locales/pt_PT.po new file mode 100644 index 0000000..88cd7f2 --- /dev/null +++ b/locales/pt_PT.po @@ -0,0 +1,174 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: GLPi Plugin - Airwatch\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-02-06 14:44+0000\n" +"PO-Revision-Date: 2019-03-01 10:57+0000\n" +"Last-Translator: Rui Melo \n" +"Language-Team: Portuguese (Portugal) (http://www.transifex.com/teclib/glpi-plugin-airwatch/language/pt_PT/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt_PT\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: front/config.form.php:51 hook.php:38 hook.php:45 hook.php:52 hook.php:60 +#: hook.php:68 hook.php:76 hook.php:84 hook.php:92 hook.php:100 hook.php:108 +#: hook.php:116 hook.php:124 hook.php:133 hook.php:142 hook.php:151 +#: hook.php:160 hook.php:169 hook.php:180 hook.php:190 +#: inc/detail.class.php:290 +msgid "Airwatch" +msgstr "Airwatch" + +#: hook.php:38 inc/detail.class.php:118 +msgid "Airwatch ID" +msgstr "IDAirwatch" + +#: hook.php:45 +msgid "IMEI" +msgstr "IMEI" + +#: hook.php:53 +msgid "Simcard serial number" +msgstr "Número de série Simcard" + +#: hook.php:61 inc/detail.class.php:129 +msgid "Last seen" +msgstr "Última vez visto" + +#: hook.php:69 inc/detail.class.php:171 +msgid "Last enrollment date" +msgstr "Última data de inscrição" + +#: hook.php:77 +msgid "Last enrollment check date" +msgstr "Data da última verificação de inscrição" + +#: hook.php:85 inc/detail.class.php:200 +msgid "Last compliance check date" +msgstr "Data da última verificação de conformidade" + +#: hook.php:93 inc/detail.class.php:215 +msgid "Last compromised check date" +msgstr "Data da última verificação comprometida" + +#: hook.php:101 inc/detail.class.php:167 +msgid "Enrollment status" +msgstr "Estado da inscrição" + +#: hook.php:109 hook.php:171 inc/detail.class.php:196 inc/detail.class.php:303 +msgid "Compliance status" +msgstr "Status de conformidade" + +#: hook.php:117 inc/detail.class.php:211 +msgid "Compromised status" +msgstr "Estado comprometido" + +#: hook.php:125 +msgid "Data encryption" +msgstr "Criptografia de dados" + +#: hook.php:134 inc/detail.class.php:228 +msgid "Roaming enabled" +msgstr "Roaming ativo" + +#: hook.php:143 inc/detail.class.php:232 +msgid "Data roaming enabled" +msgstr "Roaming de dados ativo" + +#: hook.php:152 inc/detail.class.php:239 +msgid "Voice roaming enabled" +msgstr "Roaming de voz ativado" + +#: hook.php:161 hook.php:170 hook.php:181 +msgid "Profile" +msgstr "Perfil" + +#: hook.php:182 inc/compliance.class.php:77 +msgid "Last check date" +msgstr "Última data de verificação" + +#: inc/airwatch.class.php:65 +msgid "Import devices informations from Airwatch" +msgstr "Informações sobre a importação de dispositivos do Airwatch" + +#: inc/config.class.php:40 setup.php:71 +msgid "GLPi Airwatch Connector" +msgstr "Conector do Airwatch GLPI" + +#: inc/config.class.php:53 +msgid "Plugin configuration" +msgstr "Configuração do plugin" + +#: inc/config.class.php:56 inc/config.class.php:184 +msgid "Service URL" +msgstr "URL do serviço" + +#: inc/config.class.php:63 inc/config.class.php:194 +msgid "Airwatch Service URL" +msgstr "URL do serviço do Airwatch" + +#: inc/config.class.php:70 inc/config.class.php:204 +msgid "Airwatch Console URL" +msgstr "URL da Consola do Airwatch" + +#: inc/config.class.php:77 +msgid "Username" +msgstr "Nome de utilizador" + +#: inc/config.class.php:86 +msgid "Password" +msgstr "Senha" + +#: inc/config.class.php:95 +msgid "API Key" +msgstr "Chave API" + +#: inc/config.class.php:104 +msgid "Skip SSL check" +msgstr "Ignorar verificação SSL" + +#: inc/detail.class.php:110 +msgid "General" +msgstr "Geral" + +#: inc/detail.class.php:126 inc/detail.class.php:295 +msgid "Phone number" +msgstr "Número de Telemóvel" + +#: inc/detail.class.php:140 +msgid "Data encryption enabled" +msgstr "Criptografia de dados ativada" + +#: inc/detail.class.php:144 +msgid "Current SIM serial number" +msgstr "Número de série atual do SIM" + +#: inc/detail.class.php:160 +msgid "See device in Airwatch console" +msgstr "Veja o dispositivo no console do Airwatch" + +#: inc/detail.class.php:164 +msgid "Enrollment process" +msgstr "Processo de inscrição" + +#: inc/detail.class.php:182 +msgid "Last enrollment check" +msgstr "Última verificação de inscrição" + +#: inc/detail.class.php:193 +msgid "Other status checks" +msgstr "Outras verificações de status" + +#: inc/detail.class.php:225 +msgid "Roaming" +msgstr "Roaming" + +#: inc/compliance.class.php:66 +msgid "Compliance details" +msgstr "Detalhes de conformidade" diff --git a/setup.php b/setup.php index ab8d159..4c2bb2b 100644 --- a/setup.php +++ b/setup.php @@ -32,7 +32,7 @@ define ('AIRWATCH_API_RESULT_OK', 'ok'); define ('AIRWATCH_API_RESULT_ERROR', 'ko'); define ('AIRWATCH_USER_AGENT', 'Airwatch-Connector-1.1'); -define ('PLUGIN_AIRWATCH_VERSION', '1.4.0'); +define ('PLUGIN_AIRWATCH_VERSION', '1.4.1'); // Minimal GLPI version, inclusive define('PLUGIN_AIRWATCH_MIN_GLPI', '9.2');