From 4c0e7ffe08733c194cc1a40e86dbae19f85395be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Slischka?= Date: Sun, 22 Nov 2020 10:01:32 +0100 Subject: [PATCH] Updated dependencies, Fixed certificates, typo --- .gitignore | 3 +- _cert/eet.key | 58 +++++++++++++----------- _cert/eet.pem | 60 +++++++++++++------------ composer.json | 6 ++- composer.lock | 105 +++++++++++++++++++++++++++++++++---------- src/Dispatcher.php | 6 +-- src/Receipt.php | 4 -- src/SoapClient.php | 8 +--- src/Utils/Format.php | 2 + src/Utils/UUID.php | 2 + 10 files changed, 158 insertions(+), 96 deletions(-) diff --git a/.gitignore b/.gitignore index ef551f2..148b92b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ nbproject/* -vendor/ \ No newline at end of file +vendor/ +.idea \ No newline at end of file diff --git a/_cert/eet.key b/_cert/eet.key index 5bc2136..e960592 100644 --- a/_cert/eet.key +++ b/_cert/eet.key @@ -1,27 +1,31 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAmc1Q9bysCUuLYoDC7XZbW+ouPTaZYiJ+r8mnT+1SN/0HxGmQ -MAPcY6oN1W4dJ/F6P3ZaISi4PLtfy5fMgN1m7ilcDe3cqe3EzysCW7ZTpKq0XeRN -H4AkJ3B+QzndTfPj+qjIqp1DyUa4zEkqztfm4iNxj9QNJcwr05OZdGGd2NhxfWgg -uvkXY41/VnSRbKX9L3AjRyXSBDUX3WbOqCeUfzS7aKcyaYGnjad1HhMZLWe+N6vk -PvduQuDTtN16qdSDrT1bCNQk33o4pkywpfMEzO3T01uFBwAFacBZtFNJWGwB0M7y -9+ZbHYL6BdSWQi+07719uPzUZLXF02gCSkBFRwIDAQABAoIBACCrdTQNtLlwu5Xb -5gwM5REcKGBGVcR7sU9j1U9sCNftvpWhGsioOUtOVwvsDPNsHtyWJkT+4ku8PXgA -sab54KBcVrp6uTG7WN/ssd6LVy8WN6PuF9fGH2flRFzBUNn7IYUgDyf2qex6Qkza -ieZQBDIq9zdnArfxq6mQo7sN9TqXQu6ka9UnnCuc1b9x9NtyprZ4eYcJYTndPf3W -Wl76evgzAGZaG0l+MUrkO1ibwLx/ZG078qo4dM5XZ4TRDBWsSnH4dRRDUGRZOop/ -XDveD02+uB6+eLdeZUr4Qutwxa6DQ61TNS8EM0kjql0J444OUyQuCWtxDoLNXgH0 -YznCMKECgYEA0bevLFGHsPDBu3J/lboItib0M8YBWUCOPDMt8NWisLA4uvHk/5dJ -FOr8RgWjC34rU/a6uaKX1r8xrGkVlUVB5WgN1BmEGgYa0trpbhAyryTCcRKD5Tik -h5yuA/SySOBLD7nsoW3Xb1lGpRllV9O84h0e5+vMjwNDB2MedaIpH/ECgYEAu76Z -aHUTS5PJXjEDq7uY8/cxzr5OvoxBCcQSSBIYIqtwI4axZazrFV1eEo7Tz2BXvkOC -e2SKa6QLuo4QhJiEIAo/yFCH16iz4YYif02HyKZioVey36OQINqYmT5R2etuhwPV -rPMEtZEFmGsddHX0In695DSaLUsD6fqfxj/xcLcCgYEA0APfKBlyewpDT1dhv7S4 -IV0ACj6TZeEHdCTbo69z4MfabWuz1eVMYwg11IqQz7yE45KuYaUp8KLSdY4CD36T -vyV32fK5Okrl3lGvCjHc5CaVCyzvULTfVXgOjvPuxyRar62eTfyynMqzrN1EzVnD -V5DE8AvOaeg1WyVwuANxwTECgYAoqKluftRT7MiSVokV+wWv6BvoSzygdZ1sMQNI -imqhr4EUoInwnBc5REQoPrhOU+4MrXAnqulzUE6d80BOhv0uNyoDBrW0lbuHHtZ/ -vVmnsajwih6Z4kFHbC/aGC3/xMXmBYWT8/lUHPkaPjBd1WGuysXzExVEs9dAJ9/M -PnLaVwKBgQCUBTTzizK+VhDs6bUVmymm9Q5hnSyL9Zk4XTXKyjZeqSIdnYjNIpix -37uJVEsRitcjqewhW7kKZ8HdGak6NxgS5PTbjG7lnauf4tpp6c/MjonQnU3zYrz7 -zAW194bYeBBLP3ewfsCgvjUF7JYeMWgaaTRhVTXSOD6phBtCpOV7HQ== ------END RSA PRIVATE KEY----- +Bag Attributes + localKeyID: 83 32 3F 5D 24 6C 68 2A F4 AD 02 64 20 F6 10 8E BC 91 D4 43 +Key Attributes: +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDrVmZ6FE2jYqli +43/LbXZ1vEG8USMRcC/zbGgk5mAoQQKMtF5PIm5i84pd0cPOSRtduNODc7mwjbPK +d5r8p592zNhpei0/XbQcYQ5rpdf0Y84ZNbg9ZmB4nF8YCBy3Gk28YxfW//vIjqvk +uQK6InT4l784gtz/iNAV48ZBkgE/jp+MMii1I+y5EyYkQuRZlCJtOTKdPXECnr5O +rxrGUtbjmF7bBWLD2LXlspZoUOmh4RFfd9WHH8PmcQfij5aJq6cgIB2YENCBHSA1 +/HZZEd8vNLv05owb/BOvXj4n86lYJ8tlJVMcorAsrEzVy+XU++78/j9PewL0ft0j +ETHd0U8DAgMBAAECggEBAIqz154oDUI4yiCweQeKsoDdvdih8Ys7ledgg1kMNqxC +9J+9RsBZSLolU+3Lzh3s1KY+Yttc/5phShAQwlYa7U91mC9ChRyNu7PmODuV+Vve +3v/Yu4fkqQMtFpbxYQtCA4L+3HQpV1pzTDh4GnVeDZbeySMjbeFl306nepf216l+ +4o2t260RCgC9NU6kybrgrL9mpa2v+0XNugKzjwy3Lv5KUhtTanQm7fOztb8DxvqP +h/j8j504d3SCWTzeGwYWw2lwDZx0wAP0b0fB8oiO9JzHBc+t/R18vS6LaslDmvLi +DM8R0ivySdSJKD5f5CAWlMTkcKkbFblnUhw7KTCH77ECgYEA9+TUwiPf4aZiIzMW +I2Y7AdkF9uwmTzaXZYN+MQycShwfmpOscY+6EL2f2majCGcNEduPB3ZLSgkk1oga +g4Q2VKDyTSMT70FyRGCm/hIHxtWm2KWpUcJ0LKwV3C+XS+v3dI9cEuFeiC2Dv67Y +GLqAnqPUS4Pv8Ed3nLN4zZdONWUCgYEA8wh1FDS9KczhgyzPU+a59blVER0LP7c2 +ErXCk815qCsM3aNy1NBFfuyLuChf6XxRvArRibI9TtFlSWq9PKsSWRwgILpS8YxO +g5QA5iJdh5O1L6EGnFmLiw1aUlMJsKmsc2f5klLAacA6ljIFB6A1voeume1Ryozq +wYhO2uLWgEcCgYBBt5pntVb+3TsbFcoCrHFsNfqM0WH+kfxk3w0vN6afRwFh21BV +8sJi+cJNBfSmn5spZsluMwAWqoHnlcFhqEU2/kv+AxSf0vvWAMGEjYceQTmwKYrP +r/tYdG5/Jua3K+E4N2EzaCfFdjt9L37+X0MFy2zWcC3Fx0yAcFvQNRJ4uQKBgHAC +nNtUNz7Vs7YeZ+vWciyjX2aEyVNzYFOdO/GdCQ4N0V8xXtJgrzcBVJ/q09Grv4v4 +PHzHDmSOM61zqYYVnl49jT0oQuQa83DHPObUPeEnnaE3CPH0f1D2NYOty9CFUvrZ +l/ftdcsHkrj4ksLh/wMyS7Gb5E+DRQsvhJBzbcMvAoGBAODcoE5dkDH6jPYOkwC5 +9cp6olFNc8Mp5+XF3mAMkpiB16lPM/SdolAmuTl+cDF5QJoCAJOMkRAOWJqpPZkw +kG2TVi0t2EQa5xCBbsadl82uKB50+BbViRkaHQUinFDKLZWlUQdjgLT7U1PXza4W +A6ns1H9hLvnZpCRasR6oMVqf +-----END PRIVATE KEY----- \ No newline at end of file diff --git a/_cert/eet.pem b/_cert/eet.pem index a38db35..a9547ce 100644 --- a/_cert/eet.pem +++ b/_cert/eet.pem @@ -1,31 +1,33 @@ Bag Attributes - localKeyID: 28 5D 7B 50 52 15 97 43 07 FC 4C E6 85 2D 5D BE 7B 96 AF 15 -subject=/DC=CZ/CN=CZ00000019/description=pravnicka osoba -issuer=/DC=CZ/O=\xC4\x8Cesk\xC3\xA1 Republika \xE2\x80\x93 Gener\xC3\xA1ln\xC3\xAD finan\xC4\x8Dn\xC3\xAD \xC5\x99editelstv\xC3\xAD/CN=EET CA 1 Playground + localKeyID: 83 32 3F 5D 24 6C 68 2A F4 AD 02 64 20 F6 10 8E BC 91 D4 43 +subject=DC = CZ, CN = CZ00000019, description = pravnicka osoba + +issuer=DC = CZ, O = \C4\8Cesk\C3\A1 Republika \E2\80\93 Gener\C3\A1ln\C3\AD finan\C4\8Dn\C3\AD \C5\99editelstv\C3\AD, CN = EET CA 1 Playground + -----BEGIN CERTIFICATE----- -MIIEmDCCA4CgAwIBAgIEdHOXJzANBgkqhkiG9w0BAQsFADB3MRIwEAYKCZImiZPy -LGQBGRYCQ1oxQzBBBgNVBAoMOsSMZXNrw6EgUmVwdWJsaWthIOKAkyBHZW5lcsOh -bG7DrSBmaW5hbsSNbsOtIMWZZWRpdGVsc3R2w60xHDAaBgNVBAMTE0VFVCBDQSAx -IFBsYXlncm91bmQwHhcNMTYwOTMwMDkwMzU5WhcNMTkwOTMwMDkwMzU5WjBDMRIw -EAYKCZImiZPyLGQBGRYCQ1oxEzARBgNVBAMTCkNaMDAwMDAwMTkxGDAWBgNVBA0T -D3ByYXZuaWNrYSBvc29iYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AJnNUPW8rAlLi2KAwu12W1vqLj02mWIifq/Jp0/tUjf9B8RpkDAD3GOqDdVuHSfx -ej92WiEouDy7X8uXzIDdZu4pXA3t3KntxM8rAlu2U6SqtF3kTR+AJCdwfkM53U3z -4/qoyKqdQ8lGuMxJKs7X5uIjcY/UDSXMK9OTmXRhndjYcX1oILr5F2ONf1Z0kWyl -/S9wI0cl0gQ1F91mzqgnlH80u2inMmmBp42ndR4TGS1nvjer5D73bkLg07TdeqnU -g609WwjUJN96OKZMsKXzBMzt09NbhQcABWnAWbRTSVhsAdDO8vfmWx2C+gXUlkIv -tO+9fbj81GS1xdNoAkpARUcCAwEAAaOCAV4wggFaMAkGA1UdEwQCMAAwHQYDVR0O -BBYEFL/0b0Iw6FY33UT8iJEy1V7nZVR6MB8GA1UdIwQYMBaAFHwwdqzM1ofR7Mkf -4nAILONf3gwHMA4GA1UdDwEB/wQEAwIGwDBjBgNVHSAEXDBaMFgGCmCGSAFlAwIB -MAEwSjBIBggrBgEFBQcCAjA8DDpUZW50byBjZXJ0aWZpa8OhdCBieWwgdnlkw6Fu -IHBvdXplIHBybyB0ZXN0b3ZhY8OtIMO6xI1lbHkuMIGXBgNVHR8EgY8wgYwwgYmg -gYaggYOGKWh0dHA6Ly9jcmwuY2ExLXBnLmVldC5jei9lZXRjYTFwZy9hbGwuY3Js -hipodHRwOi8vY3JsMi5jYTEtcGcuZWV0LmN6L2VldGNhMXBnL2FsbC5jcmyGKmh0 -dHA6Ly9jcmwzLmNhMS1wZy5lZXQuY3ovZWV0Y2ExcGcvYWxsLmNybDANBgkqhkiG -9w0BAQsFAAOCAQEAvXdWsU+Ibd1VysKnjoy6RCYVcI9+oRUSSTvQQDJLFjwn5Sm6 -Hebhci8ERGwAzd2R6uqPdzl1KCjmHOitypZ66e+/e9wj3BaDqgBKRZYvxZykaVUd -tQgG0819JZmiXTbGgOCKiUPIXO80cnP7U1ZPkVNV7WZwh0I2k/fg1VLTI5HA/x4B -eD77wiEOExa7eqePJET0jpTVK3LxSW59LLIJROh4/kfKQbTvDL5Ypw8WagAMVCPv -WnGJIcUru+ApLU4pZD9bdHSa1Ib4LpFhtWrkHYM/XqKbj2bNKKjTo5T3sU0Bf2QD -3QzkmcjlNVG0V+qAgimwTdPueU/mtExw+7z1/A== ------END CERTIFICATE----- +MIIEmTCCA4GgAwIBAgIFAKCnuv0wDQYJKoZIhvcNAQELBQAwdzESMBAGCgmSJomT +8ixkARkWAkNaMUMwQQYDVQQKDDrEjGVza8OhIFJlcHVibGlrYSDigJMgR2VuZXLD +oWxuw60gZmluYW7EjW7DrSDFmWVkaXRlbHN0dsOtMRwwGgYDVQQDExNFRVQgQ0Eg +MSBQbGF5Z3JvdW5kMB4XDTE5MDgwODE5MjM0MloXDTIyMDgwODE5MjM0MlowQzES +MBAGCgmSJomT8ixkARkWAkNaMRMwEQYDVQQDEwpDWjAwMDAwMDE5MRgwFgYDVQQN +Ew9wcmF2bmlja2Egb3NvYmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQDrVmZ6FE2jYqli43/LbXZ1vEG8USMRcC/zbGgk5mAoQQKMtF5PIm5i84pd0cPO +SRtduNODc7mwjbPKd5r8p592zNhpei0/XbQcYQ5rpdf0Y84ZNbg9ZmB4nF8YCBy3 +Gk28YxfW//vIjqvkuQK6InT4l784gtz/iNAV48ZBkgE/jp+MMii1I+y5EyYkQuRZ +lCJtOTKdPXECnr5OrxrGUtbjmF7bBWLD2LXlspZoUOmh4RFfd9WHH8PmcQfij5aJ +q6cgIB2YENCBHSA1/HZZEd8vNLv05owb/BOvXj4n86lYJ8tlJVMcorAsrEzVy+XU +++78/j9PewL0ft0jETHd0U8DAgMBAAGjggFeMIIBWjAJBgNVHRMEAjAAMB0GA1Ud +DgQWBBT8zaUMxlfEGXSD/2PZ089ZLGgerTAfBgNVHSMEGDAWgBR8MHaszNaH0ezJ +H+JwCCzjX94MBzAOBgNVHQ8BAf8EBAMCBsAwYwYDVR0gBFwwWjBYBgpghkgBZQMC +ATABMEowSAYIKwYBBQUHAgIwPAw6VGVudG8gY2VydGlmaWvDoXQgYnlsIHZ5ZMOh +biBwb3V6ZSBwcm8gdGVzdG92YWPDrSDDusSNZWx5LjCBlwYDVR0fBIGPMIGMMIGJ +oIGGoIGDhilodHRwOi8vY3JsLmNhMS1wZy5lZXQuY3ovZWV0Y2ExcGcvYWxsLmNy +bIYqaHR0cDovL2NybDIuY2ExLXBnLmVldC5jei9lZXRjYTFwZy9hbGwuY3Jshipo +dHRwOi8vY3JsMy5jYTEtcGcuZWV0LmN6L2VldGNhMXBnL2FsbC5jcmwwDQYJKoZI +hvcNAQELBQADggEBAKVFyv168b/q0X568G+JDvNnz4XVElbJ1r9ro/xv58QP+FD8 +PJSR5qxN2F7zKGNYTCee0jSo+XY1KEoSkmeoYHXnQpm7+NG7iUYc2OWu0B3hC/wM +MhNEDtmsTwqSLjgSk6pZTTRXfvtaHf7zvU8iw1PGFhb9m9bJlOfLwoMeFclOpdfo +80pbwRz5t8io/c0lvGodlYj7INHxjlwdwWf3m2mUx4iuKvoAev0ASCdSMDuUWWjY +iMT3PEUqeabeM2dn3xccQ2EhgIcCwhQs2MCA/FDLBbiOt63mUJPJHATIFi/31VKt +z11/Gc434HHsVYB8U/aammSyIfMp6bNE6LhaFe8= +-----END CERTIFICATE----- \ No newline at end of file diff --git a/composer.json b/composer.json index 458b49a..ce5f3b1 100644 --- a/composer.json +++ b/composer.json @@ -5,9 +5,11 @@ "license": ["MIT", "BSD-3-Clause", "GPL-2.0", "GPL-3.0"], "require": { "php": ">=5.6.0", - "robrichards/xmlseclibs": "2.0.*", + "robrichards/xmlseclibs": "^3.1", "robrichards/wse-php": "2.0.*", - "ext-curl": "*" + "ext-curl": "*", + "ext-dom": "*", + "ext-soap": "*" }, "require-dev": { "nette/tester": "~1.4" diff --git a/composer.lock b/composer.lock index 0ee40d4..cc6c20e 100644 --- a/composer.lock +++ b/composer.lock @@ -1,56 +1,107 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "hash": "bea16da66da6f91e179521c07fc5ae30", - "content-hash": "7d487855f7afb2f3e7ab23495527aae4", + "content-hash": "c66b6a278e64af47426a00b37ffdb8ce", "packages": [ { "name": "robrichards/wse-php", - "version": "dev-master", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/robrichards/wse-php.git", - "reference": "ed6c3cefaa80604de539e69b0affaca67e11195e" + "reference": "7d2218937008e8badac5d080309bab76431fbc61" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/robrichards/wse-php/zipball/ed6c3cefaa80604de539e69b0affaca67e11195e", - "reference": "ed6c3cefaa80604de539e69b0affaca67e11195e", + "url": "https://api.github.com/repos/robrichards/wse-php/zipball/7d2218937008e8badac5d080309bab76431fbc61", + "reference": "7d2218937008e8badac5d080309bab76431fbc61", "shasum": "" }, + "require": { + "php": ">= 5.3", + "robrichards/xmlseclibs": ">=2.0" + }, "type": "library", "autoload": { - "psr-0": { - "": "src/" - }, - "files": [ - "xmlseclibs.php" - ] + "psr-4": { + "RobRichards\\WsePhp\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD" + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Rob Richards", + "homepage": "http://www.cdatazone.org/", + "role": "Main developer" + } ], "description": "Libraries for adding WS-* support to ext/soap in PHP.", - "time": "2016-01-29 10:34:55" + "homepage": "https://github.com/robrichards/wse-php", + "keywords": [ + "WS-Security", + "soap", + "ws-addressing" + ], + "time": "2017-08-31T09:48:18+00:00" + }, + { + "name": "robrichards/xmlseclibs", + "version": "3.1.1", + "source": { + "type": "git", + "url": "https://github.com/robrichards/xmlseclibs.git", + "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df", + "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "php": ">= 5.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "RobRichards\\XMLSecLibs\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "A PHP library for XML Security", + "homepage": "https://github.com/robrichards/xmlseclibs", + "keywords": [ + "security", + "signature", + "xml", + "xmldsig" + ], + "time": "2020-09-05T13:00:25+00:00" } ], "packages-dev": [ { "name": "nette/tester", - "version": "v1.7.1", + "version": "v1.7.2", "source": { "type": "git", "url": "https://github.com/nette/tester.git", - "reference": "d97534578e8cf66eabe081e7d5eaa4dd527ab0c8" + "reference": "c81e276f9809143312c5be51952b1316901b8403" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/tester/zipball/d97534578e8cf66eabe081e7d5eaa4dd527ab0c8", - "reference": "d97534578e8cf66eabe081e7d5eaa4dd527ab0c8", + "url": "https://api.github.com/repos/nette/tester/zipball/c81e276f9809143312c5be51952b1316901b8403", + "reference": "c81e276f9809143312c5be51952b1316901b8403", "shasum": "" }, "require": { @@ -86,14 +137,20 @@ "homepage": "https://nette.org/contributors" } ], - "description": "An easy-to-use PHP unit testing framework.", + "description": "Nette Tester: enjoyable unit testing in PHP with code coverage reporter. ????", "homepage": "https://tester.nette.org", "keywords": [ + "Xdebug", + "assertions", + "clover", + "code coverage", "nette", + "phpdbg", + "phpunit", "testing", "unit" ], - "time": "2016-03-19 14:34:02" + "time": "2018-06-01T09:33:19+00:00" } ], "aliases": [], @@ -102,7 +159,9 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=5.6.0" + "php": ">=5.6.0", + "ext-curl": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } diff --git a/src/Dispatcher.php b/src/Dispatcher.php index 7df8aaa..3927274 100644 --- a/src/Dispatcher.php +++ b/src/Dispatcher.php @@ -5,9 +5,9 @@ use Ondrejnov\EET\Exceptions\ClientException; use Ondrejnov\EET\Exceptions\RequirementsException; use Ondrejnov\EET\Exceptions\ServerException; -use Ondrejnov\EET\SoapClient; use Ondrejnov\EET\Utils\Format; use RobRichards\XMLSecLibs\XMLSecurityKey; +use function implode; /** * Receipt for Ministry of Finance @@ -163,7 +163,7 @@ public function getCheckCodes(Receipt $receipt) { Format::price($receipt->celk_trzba) ]; - $this->pkpCode = $objKey->signData(join('|', $arr)); + $this->pkpCode = $objKey->signData(implode('|', $arr)); $this->bkpCode = Format::BKP(sha1($this->pkpCode)); return [ @@ -394,7 +394,5 @@ public function getPkpCode() { public function getBkpCode() { return $this->bkpCode; } - - } diff --git a/src/Receipt.php b/src/Receipt.php index 3015e6f..01e0dbd 100644 --- a/src/Receipt.php +++ b/src/Receipt.php @@ -2,10 +2,6 @@ namespace Ondrejnov\EET; -use Ondrejnov\EET\Exceptions\ServerException; -use Ondrejnov\EET\SoapClient; -use Ondrejnov\EET\Utils\Format; - /** * Receipt for Ministry of Finance */ diff --git a/src/SoapClient.php b/src/SoapClient.php index fb17a9a..019697a 100644 --- a/src/SoapClient.php +++ b/src/SoapClient.php @@ -175,9 +175,9 @@ public function __doRequestByCurl($request, $location, $action, $version, $one_w // Return? if ($one_way) { return null; - } else { - return $body; } + + return $body; } private function __setCurlOptions($curl, array $options) @@ -294,8 +294,4 @@ public function __getLastResponseBody() return $this->lastResponseBody; } - - - - } diff --git a/src/Utils/Format.php b/src/Utils/Format.php index af406e1..f12944b 100644 --- a/src/Utils/Format.php +++ b/src/Utils/Format.php @@ -8,6 +8,8 @@ public static function price($value) { if ($value !== NULL) { return number_format($value, 2, '.', ''); } + + return null; } public static function BKP($code) { diff --git a/src/Utils/UUID.php b/src/Utils/UUID.php index 9674a43..e7e539a 100644 --- a/src/Utils/UUID.php +++ b/src/Utils/UUID.php @@ -6,6 +6,7 @@ class UUID { + public static function v4() { return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x', @@ -29,4 +30,5 @@ public static function v4() mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff) ); } + } \ No newline at end of file