WordPress.org
Get WordPress

Plugin Directory

Changeset 2166154


Ignore:
Timestamp:
10/01/2019 06:32:21 AM (6 years ago)
Author:
stinaglobal
Message:

Version 2.2.0

Location:
woo-dp-internetmarke
Files:
439 added
1 deleted
84 edited

Legend:

Unmodified
Added
Removed

  • woo-dp-internetmarke/trunk/composer.json

    r2010628 r2166154  
    2727    "require": {
    2828        "setasign/fpdi-fpdf": "^2.0",
    29         "wsdltophp/wssecurity": "^1.1"
     29        "wsdltophp/wssecurity": "^1.1",
     30        "ext-soap": "*"
    3031    },
    3132    "require-dev": {
    3233        "phpunit/phpunit": "7",
    3334        "brain/monkey": "^2.2"
     35    },
     36    "config": {
     37        "optimize-autoloader": true
    3438    }
    3539}

  • woo-dp-internetmarke/trunk/composer.lock

    r2121236 r2166154  
    22    "_readme": [
    33        "This file locks the dependencies of your project to a known state",
    4         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
     4        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
    55        "This file is @generated automatically"
    66    ],
    … …  
    4848        {
    4949            "name": "setasign/fpdi",
    50             "version": "v2.2.0",
     50            "version": "v2.1.1",
    5151            "source": {
    5252                "type": "git",
    5353                "url": "https://github.com/Setasign/FPDI.git",
    54                 "reference": "3c266002f8044f61b17329f7cd702d44d73f0f7f"
    55             },
    56             "dist": {
    57                 "type": "zip",
    58                 "url": "https://api.github.com/repos/Setasign/FPDI/zipball/3c266002f8044f61b17329f7cd702d44d73f0f7f",
    59                 "reference": "3c266002f8044f61b17329f7cd702d44d73f0f7f",
     54                "reference": "356de9cb6b6a826ac952c86aee6599463ea87362"
     55            },
     56            "dist": {
     57                "type": "zip",
     58                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/356de9cb6b6a826ac952c86aee6599463ea87362",
     59                "reference": "356de9cb6b6a826ac952c86aee6599463ea87362",
    6060                "shasum": ""
    6161            },
    … …  
    105105                "pdf"
    106106            ],
    107             "time": "2019-01-30T14:11:19+00:00"
     107            "time": "2018-11-06T10:02:00+00:00"
    108108        },
    109109        {
    110110            "name": "setasign/fpdi-fpdf",
    111             "version": "v2.2.0",
     111            "version": "v2.1.0",
    112112            "source": {
    113113                "type": "git",
    114114                "url": "https://github.com/Setasign/FPDI-FPDF.git",
    115                 "reference": "e4363ac09e1b766b38ebea1c3cbe82b3480a11e9"
    116             },
    117             "dist": {
    118                 "type": "zip",
    119                 "url": "https://api.github.com/repos/Setasign/FPDI-FPDF/zipball/e4363ac09e1b766b38ebea1c3cbe82b3480a11e9",
    120                 "reference": "e4363ac09e1b766b38ebea1c3cbe82b3480a11e9",
     115                "reference": "c13ff727115f4fab040d58b559929113cc1be8e2"
     116            },
     117            "dist": {
     118                "type": "zip",
     119                "url": "https://api.github.com/repos/Setasign/FPDI-FPDF/zipball/c13ff727115f4fab040d58b559929113cc1be8e2",
     120                "reference": "c13ff727115f4fab040d58b559929113cc1be8e2",
    121121                "shasum": ""
    122122            },
    123123            "require": {
    124124                "setasign/fpdf": "^1.8",
    125                 "setasign/fpdi": "^2.2"
     125                "setasign/fpdi": "^2.1"
    126126            },
    127127            "type": "library",
    … …  
    144144                "pdf"
    145145            ],
    146             "time": "2019-01-30T14:38:19+00:00"
     146            "time": "2018-11-06T10:40:46+00:00"
    147147        },
    148148        {
    149149            "name": "wsdltophp/wssecurity",
    150             "version": "1.2.2",
     150            "version": "1.1.0",
    151151            "source": {
    152152                "type": "git",
    153153                "url": "https://github.com/WsdlToPhp/WsSecurity.git",
    154                 "reference": "6a450af3cd462cbf73fdb3a09e80322da893af4f"
    155             },
    156             "dist": {
    157                 "type": "zip",
    158                 "url": "https://api.github.com/repos/WsdlToPhp/WsSecurity/zipball/6a450af3cd462cbf73fdb3a09e80322da893af4f",
    159                 "reference": "6a450af3cd462cbf73fdb3a09e80322da893af4f",
     154                "reference": "67ba2bf3fe9cb08c2d130286f27c72e5a36f0fa3"
     155            },
     156            "dist": {
     157                "type": "zip",
     158                "url": "https://api.github.com/repos/WsdlToPhp/WsSecurity/zipball/67ba2bf3fe9cb08c2d130286f27c72e5a36f0fa3",
     159                "reference": "67ba2bf3fe9cb08c2d130286f27c72e5a36f0fa3",
    160160                "shasum": ""
    161161            },
    … …  
    194194                    "email": "[email protected]",
    195195                    "role": "Contributor"
    196                 },
    197                 {
    198                     "name": "NtlBldrv",
    199                     "role": "Contributor"
    200                 },
    201                 {
    202                     "name": "baijunyao",
    203                     "email": "[email protected]",
    204                     "role": "Contributor"
    205196                }
    206197            ],
    … …  
    211202                "wsse"
    212203            ],
    213             "time": "2019-04-09T08:40:37+00:00"
     204            "time": "2018-10-03T19:26:08+00:00"
    214205        }
    215206    ],
    … …  
    258249        {
    259250            "name": "brain/monkey",
    260             "version": "2.2.1",
     251            "version": "2.2.0",
    261252            "source": {
    262253                "type": "git",
    263254                "url": "https://github.com/Brain-WP/BrainMonkey.git",
    264                 "reference": "326a537bf518edd61bc57ab275e8b075ebb8a1a9"
    265             },
    266             "dist": {
    267                 "type": "zip",
    268                 "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/326a537bf518edd61bc57ab275e8b075ebb8a1a9",
    269                 "reference": "326a537bf518edd61bc57ab275e8b075ebb8a1a9",
     255                "reference": "ed9e0698bc1292f33698719da8ca1aa2e18acc51"
     256            },
     257            "dist": {
     258                "type": "zip",
     259                "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/ed9e0698bc1292f33698719da8ca1aa2e18acc51",
     260                "reference": "ed9e0698bc1292f33698719da8ca1aa2e18acc51",
    270261                "shasum": ""
    271262            },
    … …  
    318309                "testing"
    319310            ],
    320             "time": "2019-03-15T13:42:24+00:00"
     311            "time": "2017-12-01T16:32:09+00:00"
    321312        },
    322313        {
    323314            "name": "doctrine/instantiator",
    324             "version": "1.2.0",
     315            "version": "1.1.0",
    325316            "source": {
    326317                "type": "git",
    327318                "url": "https://github.com/doctrine/instantiator.git",
    328                 "reference": "a2c590166b2133a4633738648b6b064edae0814a"
    329             },
    330             "dist": {
    331                 "type": "zip",
    332                 "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
    333                 "reference": "a2c590166b2133a4633738648b6b064edae0814a",
     319                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
     320            },
     321            "dist": {
     322                "type": "zip",
     323                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
     324                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
    334325                "shasum": ""
    335326            },
    … …  
    338329            },
    339330            "require-dev": {
    340                 "doctrine/coding-standard": "^6.0",
     331                "athletic/athletic": "~0.1.8",
    341332                "ext-pdo": "*",
    342333                "ext-phar": "*",
    343                 "phpbench/phpbench": "^0.13",
    344                 "phpstan/phpstan-phpunit": "^0.11",
    345                 "phpstan/phpstan-shim": "^0.11",
    346                 "phpunit/phpunit": "^7.0"
     334                "phpunit/phpunit": "^6.2.3",
     335                "squizlabs/php_codesniffer": "^3.0.2"
    347336            },
    348337            "type": "library",
    … …  
    369358            ],
    370359            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
    371             "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
     360            "homepage": "https://github.com/doctrine/instantiator",
    372361            "keywords": [
    373362                "constructor",
    374363                "instantiate"
    375364            ],
    376             "time": "2019-03-17T17:37:11+00:00"
     365            "time": "2017-07-22T11:58:36+00:00"
    377366        },
    378367        {
    … …  
    426415        {
    427416            "name": "mockery/mockery",
    428             "version": "1.2.2",
     417            "version": "1.2.0",
    429418            "source": {
    430419                "type": "git",
    431420                "url": "https://github.com/mockery/mockery.git",
    432                 "reference": "0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2"
    433             },
    434             "dist": {
    435                 "type": "zip",
    436                 "url": "https://api.github.com/repos/mockery/mockery/zipball/0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2",
    437                 "reference": "0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2",
     421                "reference": "100633629bf76d57430b86b7098cd6beb996a35a"
     422            },
     423            "dist": {
     424                "type": "zip",
     425                "url": "https://api.github.com/repos/mockery/mockery/zipball/100633629bf76d57430b86b7098cd6beb996a35a",
     426                "reference": "100633629bf76d57430b86b7098cd6beb996a35a",
    438427                "shasum": ""
    439428            },
    … …  
    444433            },
    445434            "require-dev": {
    446                 "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0"
     435                "phpunit/phpunit": "~5.7.10|~6.5|~7.0"
    447436            },
    448437            "type": "library",
    … …  
    487476                "testing"
    488477            ],
    489             "time": "2019-02-13T09:37:52+00:00"
     478            "time": "2018-10-02T21:52:37+00:00"
    490479        },
    491480        {
    492481            "name": "myclabs/deep-copy",
    493             "version": "1.9.1",
     482            "version": "1.8.1",
    494483            "source": {
    495484                "type": "git",
    496485                "url": "https://github.com/myclabs/DeepCopy.git",
    497                 "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
    498             },
    499             "dist": {
    500                 "type": "zip",
    501                 "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
    502                 "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
     486                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
     487            },
     488            "dist": {
     489                "type": "zip",
     490                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
     491                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
    503492                "shasum": ""
    504493            },
    … …  
    535524                "object graph"
    536525            ],
    537             "time": "2019-04-07T13:18:21+00:00"
     526            "time": "2018-06-11T23:09:50+00:00"
    538527        },
    539528        {
    … …  
    695684        {
    696685            "name": "phpdocumentor/reflection-docblock",
    697             "version": "4.3.1",
     686            "version": "4.3.0",
    698687            "source": {
    699688                "type": "git",
    700689                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
    701                 "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
    702             },
    703             "dist": {
    704                 "type": "zip",
    705                 "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
    706                 "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
     690                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
     691            },
     692            "dist": {
     693                "type": "zip",
     694                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
     695                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
    707696                "shasum": ""
    708697            },
    … …  
    742731            ],
    743732            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
    744             "time": "2019-04-30T17:48:53+00:00"
     733            "time": "2017-11-30T07:14:17+00:00"
    745734        },
    746735        {
    … …  
    793782        {
    794783            "name": "phpspec/prophecy",
    795             "version": "1.8.1",
     784            "version": "1.8.0",
    796785            "source": {
    797786                "type": "git",
    798787                "url": "https://github.com/phpspec/prophecy.git",
    799                 "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76"
    800             },
    801             "dist": {
    802                 "type": "zip",
    803                 "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
    804                 "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
     788                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
     789            },
     790            "dist": {
     791                "type": "zip",
     792                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
     793                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
    805794                "shasum": ""
    806795            },
    … …  
    823812            },
    824813            "autoload": {
    825                 "psr-4": {
    826                     "Prophecy\\": "src/Prophecy"
     814                "psr-0": {
     815                    "Prophecy\\": "src/"
    827816                }
    828817            },
    … …  
    852841                "stub"
    853842            ],
    854             "time": "2019-06-13T12:50:23+00:00"
     843            "time": "2018-08-05T17:53:17+00:00"
    855844        },
    856845        {
    … …  
    1007996        {
    1008997            "name": "phpunit/php-timer",
    1009             "version": "2.1.2",
     998            "version": "2.0.0",
    1010999            "source": {
    10111000                "type": "git",
    10121001                "url": "https://github.com/sebastianbergmann/php-timer.git",
    1013                 "reference": "1038454804406b0b5f5f520358e78c1c2f71501e"
    1014             },
    1015             "dist": {
    1016                 "type": "zip",
    1017                 "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e",
    1018                 "reference": "1038454804406b0b5f5f520358e78c1c2f71501e",
     1002                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f"
     1003            },
     1004            "dist": {
     1005                "type": "zip",
     1006                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f",
     1007                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f",
    10191008                "shasum": ""
    10201009            },
    … …  
    10281017            "extra": {
    10291018                "branch-alias": {
    1030                     "dev-master": "2.1-dev"
     1019                    "dev-master": "2.0-dev"
    10311020                }
    10321021            },
    … …  
    10521041                "timer"
    10531042            ],
    1054             "time": "2019-06-07T04:22:29+00:00"
     1043            "time": "2018-02-01T13:07:23+00:00"
    10551044        },
    10561045        {
    10571046            "name": "phpunit/php-token-stream",
    1058             "version": "3.0.2",
     1047            "version": "3.0.1",
    10591048            "source": {
    10601049                "type": "git",
    10611050                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
    1062                 "reference": "c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c"
    1063             },
    1064             "dist": {
    1065                 "type": "zip",
    1066                 "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c",
    1067                 "reference": "c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c",
     1051                "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18"
     1052            },
     1053            "dist": {
     1054                "type": "zip",
     1055                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18",
     1056                "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18",
    10681057                "shasum": ""
    10691058            },
    … …  
    11011090                "tokenizer"
    11021091            ],
    1103             "time": "2019-07-08T05:24:54+00:00"
     1092            "time": "2018-10-30T05:52:18+00:00"
    11041093        },
    11051094        {
    … …  
    12371226                "xunit"
    12381227            ],
    1239             "abandoned": true,
    12401228            "time": "2018-05-29T13:54:20+00:00"
    12411229        },
    … …  
    13511339        {
    13521340            "name": "sebastian/diff",
    1353             "version": "3.0.2",
     1341            "version": "3.0.1",
    13541342            "source": {
    13551343                "type": "git",
    13561344                "url": "https://github.com/sebastianbergmann/diff.git",
    1357                 "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29"
    1358             },
    1359             "dist": {
    1360                 "type": "zip",
    1361                 "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
    1362                 "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
     1345                "reference": "366541b989927187c4ca70490a35615d3fef2dce"
     1346            },
     1347            "dist": {
     1348                "type": "zip",
     1349                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce",
     1350                "reference": "366541b989927187c4ca70490a35615d3fef2dce",
    13631351                "shasum": ""
    13641352            },
    … …  
    13671355            },
    13681356            "require-dev": {
    1369                 "phpunit/phpunit": "^7.5 || ^8.0",
     1357                "phpunit/phpunit": "^7.0",
    13701358                "symfony/process": "^2 || ^3.3 || ^4"
    13711359            },
    … …  
    14031391                "unified diff"
    14041392            ],
    1405             "time": "2019-02-04T06:01:07+00:00"
     1393            "time": "2018-06-10T07:54:39+00:00"
    14061394        },
    14071395        {
    … …  
    18041792        },
    18051793        {
    1806             "name": "symfony/polyfill-ctype",
    1807             "version": "v1.11.0",
    1808             "source": {
    1809                 "type": "git",
    1810                 "url": "https://github.com/symfony/polyfill-ctype.git",
    1811                 "reference": "82ebae02209c21113908c229e9883c419720738a"
    1812             },
    1813             "dist": {
    1814                 "type": "zip",
    1815                 "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
    1816                 "reference": "82ebae02209c21113908c229e9883c419720738a",
    1817                 "shasum": ""
    1818             },
    1819             "require": {
    1820                 "php": ">=5.3.3"
    1821             },
    1822             "suggest": {
    1823                 "ext-ctype": "For best performance"
    1824             },
    1825             "type": "library",
    1826             "extra": {
    1827                 "branch-alias": {
    1828                     "dev-master": "1.11-dev"
    1829                 }
    1830             },
    1831             "autoload": {
    1832                 "psr-4": {
    1833                     "Symfony\\Polyfill\\Ctype\\": ""
    1834                 },
    1835                 "files": [
    1836                     "bootstrap.php"
    1837                 ]
    1838             },
    1839             "notification-url": "https://packagist.org/downloads/",
    1840             "license": [
    1841                 "MIT"
    1842             ],
    1843             "authors": [
    1844                 {
    1845                     "name": "Symfony Community",
    1846                     "homepage": "https://symfony.com/contributors"
    1847                 },
    1848                 {
    1849                     "name": "Gert de Pagter",
    1850                     "email": "[email protected]"
    1851                 }
    1852             ],
    1853             "description": "Symfony polyfill for ctype functions",
    1854             "homepage": "https://symfony.com",
    1855             "keywords": [
    1856                 "compatibility",
    1857                 "ctype",
    1858                 "polyfill",
    1859                 "portable"
    1860             ],
    1861             "time": "2019-02-06T07:57:58+00:00"
    1862         },
    1863         {
    18641794            "name": "theseer/tokenizer",
    1865             "version": "1.1.3",
     1795            "version": "1.1.0",
    18661796            "source": {
    18671797                "type": "git",
    18681798                "url": "https://github.com/theseer/tokenizer.git",
    1869                 "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
    1870             },
    1871             "dist": {
    1872                 "type": "zip",
    1873                 "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
    1874                 "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
     1799                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
     1800            },
     1801            "dist": {
     1802                "type": "zip",
     1803                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
     1804                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
    18751805                "shasum": ""
    18761806            },
    … …  
    18991829            ],
    19001830            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
    1901             "time": "2019-06-13T22:48:21+00:00"
     1831            "time": "2017-04-07T12:08:54+00:00"
    19021832        },
    19031833        {
    19041834            "name": "webmozart/assert",
    1905             "version": "1.4.0",
     1835            "version": "1.3.0",
    19061836            "source": {
    19071837                "type": "git",
    19081838                "url": "https://github.com/webmozart/assert.git",
    1909                 "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
    1910             },
    1911             "dist": {
    1912                 "type": "zip",
    1913                 "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
    1914                 "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
    1915                 "shasum": ""
    1916             },
    1917             "require": {
    1918                 "php": "^5.3.3 || ^7.0",
    1919                 "symfony/polyfill-ctype": "^1.8"
     1839                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
     1840            },
     1841            "dist": {
     1842                "type": "zip",
     1843                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
     1844                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
     1845                "shasum": ""
     1846            },
     1847            "require": {
     1848                "php": "^5.3.3 || ^7.0"
    19201849            },
    19211850            "require-dev": {
    … …  
    19501879                "validate"
    19511880            ],
    1952             "time": "2018-12-25T11:19:39+00:00"
     1881            "time": "2018-01-29T19:49:41+00:00"
    19531882        }
    19541883    ],

  • woo-dp-internetmarke/trunk/includes/Internetmarke.php

    r2121236 r2166154  
    3131     * @var string
    3232     */
    33     public $version = '2.1.8';
     33    public $version = '2.2.0';
    3434
    3535    /**

  • woo-dp-internetmarke/trunk/includes/Logger.php

    r2115536 r2166154  
    33namespace WCDPI;
    44
    5 /**
    6  * WCDPI Logger.
    7  *
    8  * @version 1.0.0
    9  */
     5use DateTime;
     6use Exception;
     7use SoapFault;
     8use Throwable;
    109
    1110defined('ABSPATH') || exit;
    1211
    13 /**
    14  * Logger class.
    15  */
    1612class Logger
    1713{
    1814    /**
    19      * Directory containing the log files (inside the main plugin folder)
    20      *
    21      * @var   string
    22      * @since 1.0.0
    23      */
    24     const LOG_DIR = 'logs';
    25 
    26     /**
    27      * Debug file name
    28      *
    29      * @var   string
    30      * @since 1.0.0
     15     * @var string
    3116     */
    3217    const DEBUG_FILE = 'debug.log';
    3318
    3419    /**
    35      * Error file name
    36      *
    37      * @var   string
    38      * @since 1.0.0
     20     * @var string
    3921     */
    4022    const ERROR_FILE = 'error.log';
    … …  
    5335                return false;
    5436            }
    55         } else {
    56             return false;
    57         }
    58     }
    59 
    60     /**
    61      * Calculates and returns the given log file size.
    62      *
    63      * @param string $file either 'error' or 'debug'
    64      *
    65      * @return string
    66      */
    67     public static function getFileSize($file)
    68     {
    69         if ($file == 'error') {
    70             $file_name = WCDPI_LOG_DIR . self::ERROR_FILE;
    71         } elseif ($file == 'debug') {
    72             $file_name = WCDPI_LOG_DIR . self::DEBUG_FILE;
    73         }
    74 
    75         if (file_exists($file_name)) {
    76             return self::formatBytes(filesize($file_name));
    77         } else {
    78             return self::formatBytes(0);
    79         }
    80     }
    81 
    82     /**
    83      * Format a number of bytes into a human readable string
    84      *
    85      * @param integer $bytes     Number of bytes to calculate
    86      * @param integer $precision Defines the decimal precision
    87      *
     37        }
     38
     39        return false;
     40    }
     41
     42    /**
     43     * Format a number of bytes into a human readable string.
     44     *
     45     * @param int $bytes     Number of bytes to calculate
     46     * @param int $precision Defines the decimal precision
     47     *
    8848     * @return string
    8949     */
    … …  
    9656        $pow = min($pow, count($units) - 1);
    9757
    98         // Uncomment one of the following alternatives
    99         // $bytes /= pow(1024, $pow);
    100         // $bytes /= (1 << (10 * $pow));
    101 
    10258        return round($bytes, $precision) . ' ' . $units[$pow];
    10359    }
    … …  
    10662     * Helper function for converting any PHP value into a string.
    10763     *
    108      * @param object  $object The given object to convert
    109      * @param boolean $JSCode Identifies the object as JavaScript Code.
    110      *
    111      * @since  1.0.0
     64     * @param object $object The given object to convert
     65     * @param bool   $JSCode Identifies the object as JavaScript Code.
     66     *
    11267     * @return string
    11368     */
    … …  
    167122     * Helper function for getting a log label from the backtrace.
    168123     *
    169      * @since 1.0.0
     124     * @return string
    170125     */
    171126    protected static function labelFromBacktrace($backtrace)
    … …  
    177132     * Log a value to the browser console.
    178133     *
    179      * @since 1.0.0
     134     * @param mixed $object
     135     * @param null  $label
    180136     */
    181137    public static function console($object, $label = null)
    … …  
    201157     * Log the backtrace to the browser console.
    202158     *
    203      * @since 1.0.0
     159     * @param bool $chronological
     160     * @param null $label
    204161     */
    205162    public static function consoleBacktrace($chronological = true, $label = null)
    206163    {
    207         if (!self::isLoggerEnabled()) return;
     164        if (!self::isLoggerEnabled()) {
     165            return;
     166        }
    208167
    209168        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
     169
    210170        if (gettype($label) !== 'string') {
    211171            $label = self::labelFromBacktrace($backtrace);
    212172        }
     173
    213174        foreach ($backtrace as &$entry) {
    214175            if (isset($entry['file'])) {
    … …  
    216177            }
    217178        }
     179
    218180        if ($chronological) {
    219181            $backtrace = array_reverse($backtrace);
    220182            array_pop($backtrace);
    221         } else {
     183        }
     184
     185        else {
    222186            array_shift($backtrace);
    223187        }
     188
    224189        self::console($backtrace, $label);
    225190    }
    … …  
    228193     * Log a value to a file.
    229194     *
    230      * @since 1.0.0
     195     * @param mixed  $object
     196     * @param string $filename
     197     * @param null   $label
    231198     */
    232199    public static function file($object, $filename = self::DEBUG_FILE, $label = null)
    233200    {
    234         if (!self::isLoggerEnabled()) return;
     201        if (!self::isLoggerEnabled()) {
     202            return;
     203        }
    235204
    236205        static $log_files = array();
    … …  
    262231     * Log the backtrace to a file.
    263232     *
    264      * @since 1.0.0
     233     * @param bool   $chronological
     234     * @param string $filename
     235     * @param null   $label
    265236     */
    266237    public static function fileBacktrace($chronological = true, $filename = self::DEBUG_FILE, $label = null)
    267238    {
    268         if (!self::isLoggerEnabled()) return;
     239        if (!self::isLoggerEnabled()) {
     240            return;
     241        }
    269242
    270243        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
    … …  
    283256            $backtrace = array_reverse($backtrace);
    284257            array_pop($backtrace);
    285         } else {
     258        }
     259
     260        else {
    286261            array_shift($backtrace);
    287262        }
    … …  
    291266
    292267    /**
    293      * Log error messages or exception to the exception log.
    294      *
    295      * @since 1.0.0
     268     * Logs throwable errors.
     269     *
     270     * @param Throwable $error
     271     * @throws Exception
    296272     */
    297273    public static function exception($error)
    298274    {
    299         if (!self::isLoggerEnabled()) return;
    300 
    301         if ($error instanceof \Exception || $error instanceof \SoapFault) {
    302 
    303             $date = new \DateTime();
    304 
    305             if ($error instanceof \Exception) {
    306                 $message = sprintf("Exception thrown at: %s\n", $date->format('Y-m-d H:i'));
    307             } elseif ($error instanceof \SoapFault) {
    308                 $message = sprintf("SoapFault thrown at: %s\n", $date->format('Y-m-d H:i'));
     275        if (!self::isLoggerEnabled()
     276            || !$error instanceof Exception
     277            || !$error instanceof SoapFault
     278        ) {
     279            return;
     280        }
     281
     282        $date = new DateTime();
     283        $message = '';
     284
     285        if ($error instanceof Exception) {
     286            $message = sprintf("Exception thrown at: %s\n", $date->format('Y-m-d H:i'));
     287        }
     288
     289        elseif ($error instanceof SoapFault) {
     290            $message = sprintf("SoapFault thrown at: %s\n", $date->format('Y-m-d H:i'));
     291        }
     292
     293        if ($error instanceof SoapFault
     294            && property_exists($error, 'detail')
     295            && property_exists($error->detail, 'ShoppingCartValidationException')
     296            && property_exists($error->detail->ShoppingCartValidationException, 'errors')
     297        ) {
     298            $message .= sprintf(
     299                "Message: %s (%s: %s)\n",
     300                $error->getMessage(),
     301                $error->detail->ShoppingCartValidationException->errors->id,
     302                $error->detail->ShoppingCartValidationException->errors->message
     303            );
     304        }
     305
     306        else {
     307            $message .= 'Message: ' . $error->getMessage() . "\n";
     308        }
     309
     310        $message .= 'Code: ' . $error->getCode() . "\n";
     311        $message .= 'Thrown at: ' . $error->getFile() . ':' . $error->getLine() . "\n";
     312        $message .= "Trace:\n";
     313
     314
     315        foreach ($error->getTrace() as $id => $trace) {
     316            $message .= '    [' . $id . '] ';
     317
     318            if (isset($trace['class']) && isset($trace['type'])) {
     319                $message .= $trace['class'] . $trace['type'] . $trace['function'] . '() | ';
     320            } else {
     321                $message .= $trace['function'] . '() | ';
    309322            }
    310323
    311             $message .= 'Message: ' . $error->getMessage() . "\n";
    312             $message .= 'Code: ' . $error->getCode() . "\n";
    313             $message .= 'Thrown at: ' . $error->getFile() . ':' . $error->getLine() . "\n";
    314             $message .= "Trace:\n";
    315 
    316             foreach ($error->getTrace() as $id => $trace) {
    317                 $message .= '    [' . $id . '] ';
    318                 if (isset($trace['class']) && isset($trace['type'])) {
    319                     $message .= $trace['class'] . $trace['type'] . $trace['function'] . '() | ';
    320                 } else {
    321                     $message .= $trace['function'] . '() | ';
    322                 }
    323                 $message .= $trace['file'] . ':' . $trace['line'] . "\n";
    324             }
    325 
    326             self::file($message, self::ERROR_FILE);
    327         } else {
    328             self::file($error, self::ERROR_FILE);
    329         }
    330     }
    331 
     324            $message .= $trace['file'] . ':' . $trace['line'] . "\n";
     325        }
     326
     327        self::file($message, self::ERROR_FILE);
     328    }
     329
     330    /**
     331     * Wraps text in a HTML code block.
     332     *
     333     * @param $string
     334     */
    332335    public static function code($string)
    333336    {

  • woo-dp-internetmarke/trunk/includes/components/Dashboard.php

    r2115536 r2166154  
    2727    private $user_wpdb;
    2828
    29     /**
    30     * Shipment repository.
    31     *
    32     * @var \WCDPI\Interfaces\ShipmentRepository
    33     */
    34     private $shipment_wpdb;
    35 
    36     /**
    37     * OneClickForApplication connector.
    38     *
    39     * @var \WCDPI\Connectors\SOAP\OC4A
    40     */
    41     protected $oc4a;
     29    /**
     30    * Shipment repository.
     31    *
     32    * @var \WCDPI\Interfaces\ShipmentRepository
     33    */
     34    private $shipment_wpdb;
     35
     36    /**
     37    * OneClickForApplication connector.
     38    *
     39    * @var \WCDPI\Connectors\SOAP\OC4A
     40    */
     41    protected $oc4a;
    4242    /**
    4343     * Class constructor.
    4444     */
    4545
    46     /**
    47     * Helper
    48     *
    49     * @var \WCDPI\Helper
    50     */
    51     private $helper;
    52 
    53     /**
    54     * ProdWS
    55     *
    56     * @var \WCDPI\Connectors\SOAP\ProdWS
    57     */
    58     private $prodws;
    59 
    60     /**
    61     * ProductWpdb
    62     *
    63     * @var \WCDPI\Repositories\ProductWpdb
    64     */
    65     private $product_wpdb;
    66 
    67     /**
    68     * ProductWpdb
    69     *
    70     * @var \WCDPI\Repositories\ProductWpdb
    71     */
    72     private $page_format_wpdb;
     46    /**
     47    * Helper
     48    *
     49    * @var \WCDPI\Helper
     50    */
     51    private $helper;
     52
     53    /**
     54    * ProdWS
     55    *
     56    * @var \WCDPI\Connectors\SOAP\ProdWS
     57    */
     58    private $prodws;
     59
     60    /**
     61    * ProductWpdb
     62    *
     63    * @var \WCDPI\Repositories\ProductWpdb
     64    */
     65    private $product_wpdb;
     66
     67    /**
     68    * ProductWpdb
     69    *
     70    * @var \WCDPI\Repositories\ProductWpdb
     71    */
     72    private $page_format_wpdb;
    7373
    7474    public function __construct(
    7575        \WCDPI\Interfaces\UserRepository $user_wpdb,
    7676        \WCDPI\Interfaces\ShipmentRepository $shipment_wpdb,
    77         \WCDPI\Connectors\SOAP\OC4A $oc4a,
    78         \WCDPI\Helper $helper,
    79         \WCDPI\Connectors\SOAP\ProdWS $prodws,
    80         \WCDPI\Interfaces\ProductRepository $product_wpdb,
    81         \WCDPI\Interfaces\PageFormatRepository $page_format_wpdb
     77        \WCDPI\Connectors\SOAP\OC4A $oc4a,
     78        \WCDPI\Helper $helper,
     79        \WCDPI\Connectors\SOAP\ProdWS $prodws,
     80        \WCDPI\Interfaces\ProductRepository $product_wpdb,
     81        \WCDPI\Interfaces\PageFormatRepository $page_format_wpdb
    8282    ) {
    8383        $this->user_wpdb = $user_wpdb;
    … …  
    8585        $this->oc4a = $oc4a;
    8686        $this->helper = $helper;
    87         $this->prodws = $prodws;
    88         $this->product_wpdb = $product_wpdb;
    89         $this->page_format_wpdb = $page_format_wpdb;
     87        $this->prodws = $prodws;
     88        $this->product_wpdb = $product_wpdb;
     89        $this->page_format_wpdb = $page_format_wpdb;
    9090
    9191        add_action('admin_menu', array($this, 'init'), 10);
    92         add_action('admin_post_wcdpi_update_product_list_dashboard', [$this, 'updateProductList']);
    93         add_action('admin_post_wcdpi_update_page_formats_dashboard', [$this, 'updatePageFormats']);
     92        add_action('admin_post_wcdpi_update_product_list_dashboard', [$this, 'updateProductList']);
     93        add_action('admin_post_wcdpi_update_page_formats_dashboard', [$this, 'updatePageFormats']);
    9494    }
    9595
    … …  
    119119    public function showPage()
    120120    {
    121         // Portokasse
    122         $portokasse_email = get_option("_wcdpi_settings_portokasse")["_wcdpi_portokasse_email"];
    123         $portokasse_wallet = $this->helper->price(get_option('_wcdpi_portokasse_wallet') / 100);
    124         $portokasse_settings_url = add_query_arg([
     121        // Portokasse
     122        $portokasse_email = get_option("_wcdpi_settings_portokasse")["_wcdpi_portokasse_email"];
     123        $portokasse_wallet = $this->helper->price(get_option('_wcdpi_portokasse_wallet') / 100);
     124        $portokasse_settings_url = add_query_arg([
    125125            'page'    => 'internetmarke_settings',
    126126            'tab'     => 'services',
    127             'section' => 'portokasse'
    128         ], admin_url() . 'admin.php');
    129 
    130         // Wallet Top-Up
    131         $wallet_top_up_field = "_wcdpi_portokasse_wallet_topup";
    132         $wallet_top_up_credentials = $this->user_wpdb->getCredentials();
    133         $wallet_top_up_userToken = "";
    134         $wallet_top_up_walletBalance = "";
    135         if ($wallet_top_up_credentials["email"]) {
    136             $wallet_top_up_auth = $this->oc4a->authenticateUser();
    137             $wallet_top_up_userToken = $wallet_top_up_auth->userToken;
    138             $wallet_top_up_walletBalance = $wallet_top_up_auth->walletBalance;
    139         }
    140 
    141         // Shipments
    142         $status_groups = $this->shipment_wpdb->getShipmentStatusGroups();
    143         $shipments_shipment_status_groups = [];
    144         foreach ($status_groups as $entry) {
    145             if ($entry["status"] == ShipmentStatus::DELETED) continue;
    146 
    147             $status_url = add_query_arg(['page' => 'internetmarke_shipments', 'status' => ShipmentStatus::$statusKeys[$entry["status"]]], admin_url() . 'admin.php');
    148             $status_desc = "";
    149             switch ($entry["status"]) {
    150                 case ShipmentStatus::PREPARED:
    151                     $status_desc = __("Prepared", "wcdpi");
    152                     break;
    153                 case ShipmentStatus::READY_TO_SHIP:
    154                     $status_desc = __("Ready to ship", "wcdpi");
    155                     break;
    156                 case ShipmentStatus::SHIPPED:
    157                     $status_desc = __("Shipped", "wcdpi");
    158                     break;
    159                 case ShipmentStatus::DELIVERED:
    160                     $status_desc = __("Delivered", "wcdpi");
    161                     break;
    162                 case ShipmentStatus::REFUNDED:
    163                     $status_desc = __("Refunded", "wcdpi");
    164                     break;
    165                 case ShipmentStatus::RETURNED:
    166                     $status_desc = __("Returned", "wcdpi");
    167                     break;
    168                 default:
    169                     $status_desc = "";
    170                     break;
    171             }
    172 
    173             array_push($shipments_shipment_status_groups, [
    174                 "status"       => $entry["status"],
    175                 "status_count" => $entry["status_count"],
    176                 "status_desc"  => $status_desc,
    177                 "status_url"   => $status_url
    178             ]);
    179         }
    180         $shipments_url = add_query_arg([
    181             'page'    => 'internetmarke_shipments'
    182         ], admin_url() . 'admin.php');
    183 
    184         // Synchronization
    185         $synchronization_product_list_last_update = get_option("_wcdpi_settings_tools")["_wcdpi_update_product_list_timestamp"];
    186         $synchronization_page_formats_last_update = get_option("_wcdpi_settings_tools")["_wcdpi_update_page_formats_timestamp"];
    187         $synchronization_tool_url = add_query_arg([
    188             'page'    => 'internetmarke_settings',
    189             'tab'     => 'tools',
    190             'section' => 'synchronization'
    191         ], admin_url() . 'admin.php');
    192 
    193         include_once WCDPI_TEMPLATES_DIR . 'dashboard.php';
    194     }
    195 
    196     public function updateProductList()
    197     {
    198         wp_verify_nonce("wcdpi_update_product_list_dashboard");
    199         do_action('_wcdpi_update_product_list');
     127            'section' => 'portokasse'
     128        ], admin_url() . 'admin.php');
     129
     130        // Wallet Top-Up
     131        $wallet_top_up_field = "_wcdpi_portokasse_wallet_topup";
     132        $wallet_top_up_credentials = $this->user_wpdb->getCredentials();
     133        $wallet_top_up_userToken = "";
     134        $wallet_top_up_walletBalance = "";
     135
     136        if ($wallet_top_up_credentials["email"]) {
     137            $wallet_top_up_auth = $this->oc4a->authenticateUser();
     138            $wallet_top_up_userToken = $wallet_top_up_auth->userToken;
     139            $wallet_top_up_walletBalance = $wallet_top_up_auth->walletBalance;
     140        }
     141
     142        // Shipments
     143        $status_groups = $this->shipment_wpdb->getShipmentStatusGroups();
     144        $shipments_shipment_status_groups = [];
     145        foreach ($status_groups as $entry) {
     146            if ($entry["status"] == ShipmentStatus::DELETED) continue;
     147
     148            $status_url = add_query_arg(['page' => 'internetmarke_shipments', 'status' => ShipmentStatus::$statusKeys[$entry["status"]]], admin_url() . 'admin.php');
     149            $status_desc = "";
     150            switch ($entry["status"]) {
     151                case ShipmentStatus::PREPARED:
     152                    $status_desc = __("Prepared", "wcdpi");
     153                    break;
     154                case ShipmentStatus::READY_TO_SHIP:
     155                    $status_desc = __("Ready to ship", "wcdpi");
     156                    break;
     157                case ShipmentStatus::SHIPPED:
     158                    $status_desc = __("Shipped", "wcdpi");
     159                    break;
     160                case ShipmentStatus::DELIVERED:
     161                    $status_desc = __("Delivered", "wcdpi");
     162                    break;
     163                case ShipmentStatus::REFUNDED:
     164                    $status_desc = __("Refunded", "wcdpi");
     165                    break;
     166                case ShipmentStatus::RETURNED:
     167                    $status_desc = __("Returned", "wcdpi");
     168                    break;
     169                default:
     170                    $status_desc = "";
     171                    break;
     172            }
     173
     174            array_push($shipments_shipment_status_groups, [
     175                "status"       => $entry["status"],
     176                "status_count" => $entry["status_count"],
     177                "status_desc"  => $status_desc,
     178                "status_url"   => $status_url
     179            ]);
     180        }
     181        $shipments_url = add_query_arg([
     182            'page'    => 'internetmarke_shipments'
     183        ], admin_url() . 'admin.php');
     184
     185        // Synchronization
     186        $synchronization_product_list_last_update = get_option("_wcdpi_settings_tools")["_wcdpi_update_product_list_timestamp"];
     187        $synchronization_page_formats_last_update = get_option("_wcdpi_settings_tools")["_wcdpi_update_page_formats_timestamp"];
     188        $synchronization_tool_url = add_query_arg([
     189            'page'    => 'internetmarke_settings',
     190            'tab'     => 'tools',
     191            'section' => 'synchronization'
     192        ], admin_url() . 'admin.php');
     193
     194        include_once WCDPI_TEMPLATES_DIR . 'dashboard.php';
     195    }
     196
     197    public function updateProductList()
     198    {
     199        wp_verify_nonce("wcdpi_update_product_list_dashboard");
     200        do_action('_wcdpi_update_product_list');
    200201
    201202        $tmpSettings = get_option("_wcdpi_settings_tools");
    … …  
    203204        update_option('_wcdpi_settings_tools', $tmpSettings);
    204205
    205         $url = add_query_arg([
    206             'page' => "internetmarke"
    207         ], admin_url() . 'admin.php');
    208         wp_redirect(htmlspecialchars_decode($url));
    209         exit();
    210     }
    211 
    212     public function updatePageFormats()
    213     {
    214         wp_verify_nonce("wcdpi_update_page_formats_dashboard");
    215         do_action("_wcdpi_update_page_formats");
     206        $url = add_query_arg([
     207            'page' => "internetmarke"
     208        ], admin_url() . 'admin.php');
     209        wp_redirect(htmlspecialchars_decode($url));
     210        exit();
     211    }
     212
     213    public function updatePageFormats()
     214    {
     215        wp_verify_nonce("wcdpi_update_page_formats_dashboard");
     216        do_action("_wcdpi_update_page_formats");
    216217
    217218        $tmpSettings = get_option("_wcdpi_settings_tools");
    218219        $tmpSettings["_wcdpi_update_page_formats_timestamp"] = date('d.m.Y, H:i');
    219220        update_option('_wcdpi_settings_tools', $tmpSettings);
    220        
    221         $url = add_query_arg([
    222             'page' => "internetmarke"
    223         ], admin_url() . 'admin.php');
    224         wp_redirect(htmlspecialchars_decode($url));
     221
     222        $url = add_query_arg([
     223            'page' => "internetmarke"
     224        ], admin_url() . 'admin.php');
     225        wp_redirect(htmlspecialchars_decode($url));
    225226
    226227        $tmpSettings = get_option("_wcdpi_settings_tools");
    227228        $tmpSettings["_wcdpi_update_page_formats_timestamp"] = date('d.m.Y, H:i');
    228229        update_option('_wcdpi_settings_tools', $tmpSettings);
    229        
    230         exit();
    231     }
     230
     231        exit();
     232    }
    232233}

  • woo-dp-internetmarke/trunk/includes/components/Settings.php

    r2115536 r2166154  
    128128    {
    129129        try {
     130            $auth = $this->oc4a->authenticateUser();
    130131            $product_list = $this->prodws->getProductList(1);
     132            $contract_products = $this->oc4a->retrieveContractProducts($auth->userToken);
    131133        } catch (\SoapFault $sf) {
    132134            SettingsLogger::exception($sf);
    … …  
    136138
    137139        $this->product_wpdb->updateProductList($product_list);
     140        $this->product_wpdb->updateContractProducts($contract_products);
    138141    }
    139142
    … …  
    153156    public function portokasseLogout()
    154157    {
    155         delete_option('_wcdpi_user_credentials');
    156         delete_option('_wcdpi_settings_portokasse');
     158        delete_option('_wcdpi_user_credentials');
     159        delete_option('_wcdpi_settings_portokasse');
    157160    }
    158161
    159     public function packetPlusInternationalLogout()
    160     {
    161         delete_option('_wcdpi_settings_packet_plus_international');
    162     }
     162    public function packetPlusInternationalLogout()
     163    {
     164        delete_option('_wcdpi_settings_packet_plus_international');
     165    }
    163166
    164     public function packetPlusCrossBorderLogout()
    165     {
    166         delete_option('_wcdpi_settings_packet_plus_cross_border');
    167     }
     167    public function packetPlusCrossBorderLogout()
     168    {
     169        delete_option('_wcdpi_settings_packet_plus_cross_border');
     170    }
    168171}

  • woo-dp-internetmarke/trunk/includes/connectors/soap/OC4A.php

    r2115536 r2166154  
    33namespace WCDPI\Connectors\SOAP;
    44
    5 use \WCDPI\PageFormat;
    6 use \WCDPI\Logger as OC4ALogger;
    7 use \WCDPI\Interfaces\SoapService;
     5use WCDPI\PageFormat;
     6use WCDPI\Logger as OC4ALogger;
     7use WCDPI\Interfaces\SoapService;
    88
    99/**
    … …  
    173173                    'username' => $email,
    174174                    'password' => $password
     175                )
     176            )
     177        );
     178    }
     179
     180    public function retrieveContractProducts($user_token)
     181    {
     182        return $this->__soapCall(
     183            'retrieveContractProducts',
     184            array(
     185                'RetrieveContractProductsRequest' => array(
     186                    'userToken' => $user_token
    175187                )
    176188            )

  • woo-dp-internetmarke/trunk/includes/enums/ShipmentStatus.php

    r2115536 r2166154  
    33namespace WCDPI\Enums;
    44
    5 /**
    6  * Enum for shipment status.
    7  *
    8  * @since 1.1.0
    9  * @version 1.0.0
    10  */
    11 
    125defined('ABSPATH') || exit;
    136
    14 /**
    15  * ShipmentStatus Enum.
    16  */
    177abstract class ShipmentStatus
    188{
    … …  
    3424    ];
    3525
    36     public static $statusKeys = [
    37         self::PREPARED      => 'prepared',
    38         self::READY_TO_SHIP => 'ready_to_ship',
    39         self::SHIPPED       => 'shipped',
    40         self::DELIVERED     => 'delivered',
    41         self::REFUNDED      => 'refunded',
    42         self::RETURNED      => 'returned'
    43     ];
     26    public static $statusKeys = [
     27        self::PREPARED      => 'prepared',
     28        self::READY_TO_SHIP => 'ready_to_ship',
     29        self::SHIPPED       => 'shipped',
     30        self::DELIVERED     => 'delivered',
     31        self::REFUNDED      => 'refunded',
     32        self::RETURNED      => 'returned'
     33    ];
    4434}

  • woo-dp-internetmarke/trunk/includes/repositories/ProductWpdb.php

    r2115536 r2166154  
    1818class ProductWpdb extends MainWpdb implements ProductRepository
    1919{
    20     /**
    21     * Helper
    22     *
    23     * @var \WCDPI\Helper
    24     */
    25     private $helper;
     20    /**
     21    * Helper
     22    *
     23    * @var \WCDPI\Helper
     24    */
     25    private $helper;
    2626
    2727    /**
    … …  
    3131        \WCDPI\Helper $helper
    3232    ) {
    33         parent::__construct();
     33        parent::__construct();
    3434
    3535        $this->helper = $helper;
    … …  
    421421    }
    422422
     423    /**
     424     * Updates the contract product prices.
     425     *
     426     * @param \stdClass $contract_products
     427     */
     428    public function updateContractProducts($contract_products)
     429    {
     430        if (!$contract_products instanceof \stdClass
     431            || !property_exists($contract_products,'products')
     432            || !is_array($contract_products->products)
     433            || count($contract_products->products) === 0
     434        ) {
     435            return;
     436        }
     437
     438        global $wpdb;
     439
     440        foreach ($contract_products->products as $contract_product) {
     441            if (!property_exists($contract_product, 'price')
     442                || !property_exists($contract_product, 'productCode')
     443            ) {
     444                continue;
     445            }
     446
     447            $wpdb->update(
     448                $this->product_sales_table_name,
     449                array(
     450                    'price' => $contract_product->price
     451                ),
     452                array(
     453                    'product_code' => $contract_product->productCode
     454                ),
     455                array('%d'),
     456                array('%d')
     457            );
     458        }
     459    }
     460
    423461    public function getBasicProducts($prodws_id = null)
    424462    {
    … …  
    518556     * @param $args['where']
    519557     * @param $args['value']
    520      * 
     558     *
    521559     * @return int
    522560     */
    … …  
    553591    public function getFeatureUniqueId($prodws_id, $service)
    554592    {
    555         global $wpdb;
    556 
    557         $products_table = $this->product_sales_table_name;
    558         $feature_table = $this->app_service_feature_table_name;
    559         $service_table = $this->app_service_table_name;
    560 
    561         $sql = "
     593        global $wpdb;
     594
     595        $products_table = $this->product_sales_table_name;
     596        $feature_table = $this->app_service_feature_table_name;
     597        $service_table = $this->app_service_table_name;
     598
     599        $sql = "
    562600            SELECT
    563601                {$feature_table}.app_service_feature_unique_id
    … …  
    576614        ";
    577615
    578         return $wpdb->get_row($sql);
     616        return $wpdb->get_row($sql);
    579617    }
    580618}

  • woo-dp-internetmarke/trunk/includes/repositories/ShipmentWpdb.php

    r2115536 r2166154  
    299299            $product_quantity = $product["qty"];
    300300            $product_id = $product["product_id"];
    301             $sql = $wpdb->prepare("
    302                 SELECT
    303                     %d AS 'order_id'
    304                     , %d AS 'product_id'
    305                     , SUM(t_shipment_item.product_quantity) AS 'quantity'
    306                     , %d - SUM(t_shipment_item.product_quantity) AS 'quantity_open'
    307                 FROM
    308                     $shipment_item_table_name t_shipment_item
    309                     INNER JOIN $shipment_table_name t_shipment
    310                         ON 1=1
    311                         AND t_shipment_item.shipment_id = t_shipment.id
    312                 WHERE
    313                     1=1
    314                     AND t_shipment_item.order_id = %d
    315                     AND t_shipment_item.product_quantity <= %d
    316                     AND t_shipment_item.product_id = %d
    317                     AND t_shipment.status <> %d
    318                 ;
    319             ", $order_id, $product_id, $product_quantity, $order_id, $product_quantity, $product_id, ShipmentStatusEnum::REFUNDED);
     301            $sql = $wpdb->prepare(
     302                "
     303                    SELECT
     304                        %d AS 'order_id'
     305                        , %d AS 'product_id'
     306                        , SUM(t_shipment_item.product_quantity) AS 'quantity'
     307                        , %d - SUM(t_shipment_item.product_quantity) AS 'quantity_open'
     308                    FROM
     309                        $shipment_item_table_name t_shipment_item
     310                        INNER JOIN $shipment_table_name t_shipment
     311                            ON 1=1
     312                            AND t_shipment_item.shipment_id = t_shipment.id
     313                    WHERE
     314                        1=1
     315                        AND t_shipment_item.order_id = %d
     316                        AND t_shipment_item.product_quantity <= %d
     317                        AND t_shipment_item.product_id = %d
     318                        AND t_shipment.status NOT IN (%d, %d)
     319                    ;
     320                ",
     321                $order_id,
     322                $product_id,
     323                $product_quantity,
     324                $order_id,
     325                $product_quantity,
     326                $product_id,
     327                ShipmentStatusEnum::REFUNDED,
     328                ShipmentStatusEnum::DELETED
     329            );
     330
    320331            $result = $wpdb->get_row($sql, ARRAY_A);
    321332

  • woo-dp-internetmarke/trunk/includes/services/Shipment.php

    r2116694 r2166154  
    144144                );
    145145
     146                // Prepare Shipment
    146147                if ($shipment_action == 'prepare') {
    147148
    … …  
    159160
    160161                    return $return_data;
    161                 } elseif ($shipment_action == 'create') {
    162 
    163                     // Purchase Label
     162                }
     163
     164                // Purchase Label
     165                elseif ($shipment_action == 'create') {
    164166                    $data['product_code'] = $product_code;
    165167                    $data['shipment_id'] = $shipment_id;
    … …  
    181183                            $data['wcdpi_redirect_url']
    182184                        );
    183                     } else {
     185                    }
     186
     187                    else {
    184188                        $return_data['wcdpi_redirect'] = false;
    185189                    }
    … …  
    188192                }
    189193
     194            }
     195
    190196            // OneClickForApp order
    191             } else {
     197            else {
    192198                $feature           = $this->feature_wpdb->getFeatureByUniqueId($data['wcdpi_feature']);
    193199                $feature_service   = $this->feature_wpdb->getFeatureService($feature['t_feature_app_service_feature_unique_id']);
    … …  
    205211                );
    206212
     213                // Prepare Shipment
    207214                if ($shipment_action == 'prepare') {
    208 
    209215                    $return_data['wcdpi_status'] = RoutingResponseStatus::R_SUCCESS;
    210216
    … …  
    221227                    return $return_data;
    222228
    223                 } elseif ($shipment_action == 'create') {
    224                     // Purchase Label
     229                }
     230
     231                // Purchase Label
     232                elseif ($shipment_action == 'create') {
    225233                    $this->purchaseOC4ALabel([
    226234                        'product_code'             => $product_code,

  • woo-dp-internetmarke/trunk/internetmarke.php

    r2121236 r2166154  
    44 * Plugin URI: https://shop.deutschepost.de/internetmarke
    55 * Description: WordPress and WooCommerce integration for the Deutsche Post Internetmarke service.
    6  * Version: 2.1.8
     6 * Version: 2.2.0
    77 * Author: STINA
    88 * Author URI: https://www.stina-global.com/

  • woo-dp-internetmarke/trunk/readme.txt

    r2121236 r2166154  
    44Requires at least: 4.7
    55Tested up to: 5.2
    6 Stable tag: 2.1.8
     6Stable tag: 2.2.0
    77License: GPLv3
    88License URI: https://www.gnu.org/licenses/gpl-3.0.html
    … …  
    6767
    6868== Changelog ==
     69
     70= 2.2.0 - 2019-09-30 =
     71* Add - Support for individual contract product prices.
     72* Fix - You can now create shipments for the line items of deleted shipments, they now count as unshipped (as it should be).
     73* Tweak - Better error logging of non-harmonized label purchase errors.
    6974
    7075= 2.1.8 - 2019-07-11 =

  • woo-dp-internetmarke/trunk/vendor/autoload.php

    r2121236 r2166154  
    55require_once __DIR__ . '/composer/autoload_real.php';
    66
    7 return ComposerAutoloaderInit5539e907670f7955cc0069f6aeb61627::getLoader();
     7return ComposerAutoloaderInit5299b7f875a8f20db22354a0382596cb::getLoader();

  • woo-dp-internetmarke/trunk/vendor/composer/autoload_real.php

    r2121236 r2166154  
    33// autoload_real.php @generated by Composer
    44
    5 class ComposerAutoloaderInit5539e907670f7955cc0069f6aeb61627
     5class ComposerAutoloaderInit5299b7f875a8f20db22354a0382596cb
    66{
    77    private static $loader;
    … …  
    2020        }
    2121
    22         spl_autoload_register(array('ComposerAutoloaderInit5539e907670f7955cc0069f6aeb61627', 'loadClassLoader'), true, true);
     22        spl_autoload_register(array('ComposerAutoloaderInit5299b7f875a8f20db22354a0382596cb', 'loadClassLoader'), true, true);
    2323        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
    24         spl_autoload_unregister(array('ComposerAutoloaderInit5539e907670f7955cc0069f6aeb61627', 'loadClassLoader'));
     24        spl_autoload_unregister(array('ComposerAutoloaderInit5299b7f875a8f20db22354a0382596cb', 'loadClassLoader'));
    2525
    2626        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
    … …  
    2828            require_once __DIR__ . '/autoload_static.php';
    2929
    30             call_user_func(\Composer\Autoload\ComposerStaticInit5539e907670f7955cc0069f6aeb61627::getInitializer($loader));
     30            call_user_func(\Composer\Autoload\ComposerStaticInit5299b7f875a8f20db22354a0382596cb::getInitializer($loader));
    3131        } else {
    3232            $map = require __DIR__ . '/autoload_namespaces.php';

  • woo-dp-internetmarke/trunk/vendor/composer/autoload_static.php

    r2121236 r2166154  
    55namespace Composer\Autoload;
    66
    7 class ComposerStaticInit5539e907670f7955cc0069f6aeb61627
     7class ComposerStaticInit5299b7f875a8f20db22354a0382596cb
    88{
    99    public static $prefixLengthsPsr4 = array (
    … …  
    272272    {
    273273        return \Closure::bind(function () use ($loader) {
    274             $loader->prefixLengthsPsr4 = ComposerStaticInit5539e907670f7955cc0069f6aeb61627::$prefixLengthsPsr4;
    275             $loader->prefixDirsPsr4 = ComposerStaticInit5539e907670f7955cc0069f6aeb61627::$prefixDirsPsr4;
    276             $loader->classMap = ComposerStaticInit5539e907670f7955cc0069f6aeb61627::$classMap;
     274            $loader->prefixLengthsPsr4 = ComposerStaticInit5299b7f875a8f20db22354a0382596cb::$prefixLengthsPsr4;
     275            $loader->prefixDirsPsr4 = ComposerStaticInit5299b7f875a8f20db22354a0382596cb::$prefixDirsPsr4;
     276            $loader->classMap = ComposerStaticInit5299b7f875a8f20db22354a0382596cb::$classMap;
    277277
    278278        }, null, ClassLoader::class);

  • woo-dp-internetmarke/trunk/vendor/composer/installed.json

    r2115536 r2166154  
    4343    {
    4444        "name": "setasign/fpdi",
    45         "version": "v2.2.0",
    46         "version_normalized": "2.2.0.0",
     45        "version": "v2.1.1",
     46        "version_normalized": "2.1.1.0",
    4747        "source": {
    4848            "type": "git",
    4949            "url": "https://github.com/Setasign/FPDI.git",
    50             "reference": "3c266002f8044f61b17329f7cd702d44d73f0f7f"
    51         },
    52         "dist": {
    53             "type": "zip",
    54             "url": "https://api.github.com/repos/Setasign/FPDI/zipball/3c266002f8044f61b17329f7cd702d44d73f0f7f",
    55             "reference": "3c266002f8044f61b17329f7cd702d44d73f0f7f",
     50            "reference": "356de9cb6b6a826ac952c86aee6599463ea87362"
     51        },
     52        "dist": {
     53            "type": "zip",
     54            "url": "https://api.github.com/repos/Setasign/FPDI/zipball/356de9cb6b6a826ac952c86aee6599463ea87362",
     55            "reference": "356de9cb6b6a826ac952c86aee6599463ea87362",
    5656            "shasum": ""
    5757        },
    … …  
    7272            "setasign/fpdi-tfpdf": "Use this package to automatically evaluate dependencies to tFPDF."
    7373        },
    74         "time": "2019-01-30T14:11:19+00:00",
     74        "time": "2018-11-06T10:02:00+00:00",
    7575        "type": "library",
    7676        "installation-source": "dist",
    … …  
    106106    {
    107107        "name": "setasign/fpdi-fpdf",
    108         "version": "v2.2.0",
    109         "version_normalized": "2.2.0.0",
     108        "version": "v2.1.0",
     109        "version_normalized": "2.1.0.0",
    110110        "source": {
    111111            "type": "git",
    112112            "url": "https://github.com/Setasign/FPDI-FPDF.git",
    113             "reference": "e4363ac09e1b766b38ebea1c3cbe82b3480a11e9"
    114         },
    115         "dist": {
    116             "type": "zip",
    117             "url": "https://api.github.com/repos/Setasign/FPDI-FPDF/zipball/e4363ac09e1b766b38ebea1c3cbe82b3480a11e9",
    118             "reference": "e4363ac09e1b766b38ebea1c3cbe82b3480a11e9",
     113            "reference": "c13ff727115f4fab040d58b559929113cc1be8e2"
     114        },
     115        "dist": {
     116            "type": "zip",
     117            "url": "https://api.github.com/repos/Setasign/FPDI-FPDF/zipball/c13ff727115f4fab040d58b559929113cc1be8e2",
     118            "reference": "c13ff727115f4fab040d58b559929113cc1be8e2",
    119119            "shasum": ""
    120120        },
    121121        "require": {
    122122            "setasign/fpdf": "^1.8",
    123             "setasign/fpdi": "^2.2"
    124         },
    125         "time": "2019-01-30T14:38:19+00:00",
     123            "setasign/fpdi": "^2.1"
     124        },
     125        "time": "2018-11-06T10:40:46+00:00",
    126126        "type": "library",
    127127        "installation-source": "dist",
    … …  
    147147    {
    148148        "name": "wsdltophp/wssecurity",
    149         "version": "1.2.2",
    150         "version_normalized": "1.2.2.0",
     149        "version": "1.1.0",
     150        "version_normalized": "1.1.0.0",
    151151        "source": {
    152152            "type": "git",
    153153            "url": "https://github.com/WsdlToPhp/WsSecurity.git",
    154             "reference": "6a450af3cd462cbf73fdb3a09e80322da893af4f"
    155         },
    156         "dist": {
    157             "type": "zip",
    158             "url": "https://api.github.com/repos/WsdlToPhp/WsSecurity/zipball/6a450af3cd462cbf73fdb3a09e80322da893af4f",
    159             "reference": "6a450af3cd462cbf73fdb3a09e80322da893af4f",
     154            "reference": "67ba2bf3fe9cb08c2d130286f27c72e5a36f0fa3"
     155        },
     156        "dist": {
     157            "type": "zip",
     158            "url": "https://api.github.com/repos/WsdlToPhp/WsSecurity/zipball/67ba2bf3fe9cb08c2d130286f27c72e5a36f0fa3",
     159            "reference": "67ba2bf3fe9cb08c2d130286f27c72e5a36f0fa3",
    160160            "shasum": ""
    161161        },
    … …  
    168168            "phpunit/phpunit": "^4.8 || ^6.0"
    169169        },
    170         "time": "2019-04-09T08:40:37+00:00",
     170        "time": "2018-10-03T19:26:08+00:00",
    171171        "type": "library",
    172172        "installation-source": "dist",
    … …  
    196196                "email": "[email protected]",
    197197                "role": "Contributor"
    198             },
    199             {
    200                 "name": "NtlBldrv",
    201                 "role": "Contributor"
    202             },
    203             {
    204                 "name": "baijunyao",
    205                 "email": "[email protected]",
    206                 "role": "Contributor"
    207198            }
    208199        ],

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi-fpdf/README.md

    r2115536 r2166154  
    55
    66```bash
    7 $ composer require setasign/fpdi-fpdf:2.2
     7$ composer require setasign/fpdi-fpdf:2.1
    88```
    99
    … …  
    1313{
    1414    "require": {
    15         "setasign/fpdi-fpdf": "^2.2"
     15        "setasign/fpdi-fpdf": "^2.1"
    1616    }
    1717}

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi-fpdf/composer.json

    r2115536 r2166154  
    1515    "require": {
    1616        "setasign/fpdf": "^1.8",
    17         "setasign/fpdi": "^2.2"
     17        "setasign/fpdi": "^2.1"
    1818    }
    1919}

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/FpdfTpl.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/FpdfTplTrait.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi;
    … …  
    8787     * Draws a template onto the page or another template.
    8888     *
    89      * Give only one of the size parameters (width, height) to calculate the other one automatically in view to the
    90      * aspect ratio.
     89     * Omit one of the size parameters (width, height) to calculate the other one automatically in view to the aspect
     90     * ratio.
    9191     *
    9292     * @param mixed $tpl The template id
    … …  
    142142     * Get the size of a template.
    143143     *
    144      * Give only one of the size parameters (width, height) to calculate the other one automatically in view to the
    145      * aspect ratio.
     144     * Omit one of the size parameters (width, height) to calculate the other one automatically in view to the aspect
     145     * ratio.
    146146     *
    147147     * @param mixed $tpl The template id

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/Fpdi.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi;
    … …  
    3131     * @string
    3232     */
    33     const VERSION = '2.2.0';
    34 
    35     protected function _enddoc()
    36     {
    37         parent::_enddoc();
    38         $this->cleanUp();
    39     }
     33    const VERSION = '2.1.1';
    4034
    4135    /**
    4236     * Draws an imported page or a template onto the page or another template.
    4337     *
    44      * Give only one of the size parameters (width, height) to calculate the other one automatically in view to the
    45      * aspect ratio.
     38     * Omit one of the size parameters (width, height) to calculate the other one automatically in view to the aspect
     39     * ratio.
    4640     *
    4741     * @param mixed $tpl The template id
    … …  
    7165     * Get the size of an imported page or template.
    7266     *
    73      * Give only one of the size parameters (width, height) to calculate the other one automatically in view to the
    74      * aspect ratio.
     67     * Omit one of the size parameters (width, height) to calculate the other one automatically in view to the aspect
     68     * ratio.
    7569     *
    7670     * @param mixed $tpl The template id

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/FpdiException.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/FpdiTrait.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi;
    … …  
    5555
    5656    /**
    57      * Instances created internally.
     57     * The current reader id.
     58     *
     59     * @var string
     60     */
     61    protected $currentReaderId;
     62
     63    /**
     64     * Data of all imported pages.
    5865     *
    5966     * @var array
    6067     */
    61     protected $createdReaders = [];
    62 
    63     /**
    64      * The current reader id.
    65      *
    66      * @var string
    67      */
    68     protected $currentReaderId;
    69 
    70     /**
    71      * Data of all imported pages.
     68    protected $importedPages = [];
     69
     70    /**
     71     * A map from object numbers of imported objects to new assigned object numbers by FPDF.
    7272     *
    7373     * @var array
    7474     */
    75     protected $importedPages = [];
    76 
    77     /**
    78      * A map from object numbers of imported objects to new assigned object numbers by FPDF.
     75    protected $objectMap = [];
     76
     77    /**
     78     * An array with information about objects, which needs to be copied to the resulting document.
    7979     *
    8080     * @var array
    8181     */
    82     protected $objectMap = [];
    83 
    84     /**
    85      * An array with information about objects, which needs to be copied to the resulting document.
    86      *
    87      * @var array
    88      */
    8982    protected $objectsToCopy = [];
    90 
    91     /**
    92      * Release resources and file handles.
    93      *
    94      * This method is called internally when the document is created successfully. By default it only cleans up
    95      * stream reader instances which were created internally.
    96      *
    97      * @param bool $allReaders
    98      */
    99     public function cleanUp($allReaders = false)
    100     {
    101         $readers = $allReaders ? array_keys($this->readers) : $this->createdReaders;
    102         foreach ($readers as $id) {
    103             $this->readers[$id]->getParser()->getStreamReader()->cleanUp();
    104             unset($this->readers[$id]);
    105         }
    106 
    107         $this->createdReaders= [];
    108     }
    10983
    11084    /**
    … …  
    171145        } elseif (\is_string($file)) {
    172146            $streamReader = StreamReader::createByFile($file);
    173             $this->createdReaders[] = $id;
    174147        } else {
    175148            $streamReader = $file;
    … …  
    386359     * Draws an imported page onto the page.
    387360     *
    388      * Give only one of the size parameters (width, height) to calculate the other one automatically in view to the
    389      * aspect ratio.
     361     * Omit one of the size parameters (width, height) to calculate the other one automatically in view to the aspect
     362     * ratio.
    390363     *
    391364     * @param mixed $pageId The page id
    … …  
    441414     * Get the size of an imported page.
    442415     *
    443      * Give only one of the size parameters (width, height) to calculate the other one automatically in view to the
    444      * aspect ratio.
     416     * Omit one of the size parameters (width, height) to calculate the other one automatically in view to the aspect
     417     * ratio.
    445418     *
    446419     * @param mixed $tpl The template id

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/CrossReference/AbstractReader.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\CrossReference;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/CrossReference/CrossReference.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\CrossReference;
    … …  
    6565        /** @noinspection TypeUnsafeComparisonInspection */
    6666        while ($offset != false) { // By doing an unsafe comparsion we ignore faulty references to byte offset 0
    67             try {
    68                 $reader = $this->readXref($offset + $this->fileHeaderOffset);
    69             } catch (CrossReferenceException $e) {
    70                 // sometimes the file header offset is part of the byte offsets, so let's retry by resetting it to zero.
    71                 if ($e->getCode() === CrossReferenceException::INVALID_DATA && $this->fileHeaderOffset !== 0) {
    72                     $this->fileHeaderOffset = 0;
    73                     $reader = $this->readXref($offset + $this->fileHeaderOffset);
    74                 } else {
    75                     throw $e;
    76                 }
    77             }
    78 
     67            $reader = $this->readXref($offset + $this->fileHeaderOffset);
    7968            $trailer = $reader->getTrailer();
    8069            $this->checkForEncryption($trailer);

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/CrossReference/CrossReferenceException.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\CrossReference;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/CrossReference/FixedReader.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\CrossReference;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/CrossReference/LineReader.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\CrossReference;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/CrossReference/ReaderInterface.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\CrossReference;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Filter/Ascii85.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Filter;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Filter/Ascii85Exception.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Filter;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Filter/AsciiHex.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Filter;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Filter/FilterException.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Filter;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Filter/FilterInterface.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Filter;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Filter/Flate.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Filter;
    … …  
    5151
    5252                if ($data === false) {
    53                     // let's try if the checksum is CRC32
    54                     $fh = fopen('php://temp', 'w+b');
    55                     \fwrite($fh, "\x1f\x8b\x08\x00\x00\x00\x00\x00" . $oData);
    56                     \stream_filter_append($fh, 'zlib.inflate', \STREAM_FILTER_READ, ['window' => 30]);
    57                     \fseek($fh, 0);
    58                     $data = \stream_get_contents($fh);
    59                     \fclose($fh);
    60                 }
    61 
    62                 if (!$data) {
    6353                    throw new FlateException(
    6454                        'Error while decompressing stream.',

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Filter/FlateException.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Filter;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Filter/Lzw.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Filter;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Filter/LzwException.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Filter;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/PdfParser.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser;
    … …  
    113113     *
    114114     * @throws PdfParserException
    115      * @return int
    116115     */
    117116    protected function resolveFileHeader()

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/PdfParserException.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/StreamReader.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser;
    … …  
    125125    public function __destruct()
    126126    {
    127         $this->cleanUp();
    128     }
    129 
    130     /**
    131      * Closes the file handle.
    132      */
    133     public function cleanUp()
    134     {
    135         if ($this->closeStream && is_resource($this->stream)) {
     127        if ($this->closeStream) {
    136128            \fclose($this->stream);
    137129        }

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Tokenizer.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Type/PdfArray.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Type;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Type/PdfBoolean.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Type;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Type/PdfDictionary.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Type;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Type/PdfHexString.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Type;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Type/PdfIndirectObject.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Type;
    … …  
    4646        $nextToken = $tokenizer->getNextToken();
    4747        if ($nextToken === 'stream') {
    48             $value = PdfStream::parse($value, $reader, $parser);
     48            $value = PdfStream::parse($value, $reader);
    4949        } elseif ($nextToken !== false) {
    5050            $tokenizer->pushStack($nextToken);

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Type/PdfIndirectObjectReference.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Type;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Type/PdfName.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Type;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Type/PdfNull.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Type;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Type/PdfNumeric.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Type;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Type/PdfStream.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Type;
    1111
    12 use setasign\Fpdi\PdfParser\CrossReference\CrossReferenceException;
    1312use setasign\Fpdi\PdfParser\Filter\Ascii85;
    1413use setasign\Fpdi\PdfParser\Filter\AsciiHex;
    … …  
    1615use setasign\Fpdi\PdfParser\Filter\Flate;
    1716use setasign\Fpdi\PdfParser\Filter\Lzw;
    18 use setasign\Fpdi\PdfParser\PdfParser;
    1917use setasign\Fpdi\PdfParser\PdfParserException;
    2018use setasign\Fpdi\PdfParser\StreamReader;
    … …  
    3331     * @param PdfDictionary $dictionary
    3432     * @param StreamReader $reader
    35      * @param PdfParser $parser Optional to keep backwards compatibility
    3633     * @return self
    3734     * @throws PdfTypeException
    3835     */
    39     public static function parse(PdfDictionary $dictionary, StreamReader $reader, PdfParser $parser = null)
     36    public static function parse(PdfDictionary $dictionary, StreamReader $reader)
    4037    {
    4138        $v = new self;
    4239        $v->value = $dictionary;
    4340        $v->reader = $reader;
    44         $v->parser = $parser;
    4541
    4642        $offset = $reader->getOffset();
    … …  
    121117
    122118    /**
    123      * The PDF parser instance.
    124      *
    125      * @var PdfParser
    126      */
    127     protected $parser;
    128 
    129     /**
    130119     * Get the stream data.
    131120     *
    … …  
    133122     * @return bool|string
    134123     * @throws PdfTypeException
    135      * @throws CrossReferenceException
    136      * @throws PdfParserException
    137124     */
    138125    public function getStream($cache = false)
    … …  
    140127        if (\is_int($this->stream)) {
    141128            $length = PdfDictionary::get($this->value, 'Length');
    142             if ($this->parser !== null) {
    143                 $length = PdfType::resolve($length, $this->parser);
    144             }
    145 
     129            $this->reader->reset($this->stream, $length->value);
    146130            if (!($length instanceof PdfNumeric) || $length->value === 0) {
    147                 $this->reader->reset($this->stream, 100000);
    148                 $buffer = $this->extractStream();
     131                while (true) {
     132                    $buffer = $this->reader->getBuffer(false);
     133                    $length = \strpos($buffer, 'endstream');
     134                    if ($length === false) {
     135                        if (!$this->reader->increaseLength(100000)) {
     136                            return false;
     137                        }
     138                        continue;
     139                    }
     140                    break;
     141                }
     142
     143                $buffer = \substr($buffer, 0, $length);
     144                $lastByte = \substr($buffer, -1);
     145
     146                // Check for EOL
     147                if ($lastByte === "\n") {
     148                    $buffer = \substr($buffer, 0, -1);
     149                }
     150
     151                $lastByte = \substr($buffer, -1);
     152                if ($lastByte === "\r") {
     153                    $buffer = \substr($buffer, 0, -1);
     154                }
     155
    149156            } else {
    150                 $this->reader->reset($this->stream, $length->value);
    151157                $buffer = $this->reader->getBuffer(false);
    152                 if ($this->parser !== null) {
    153                     $this->reader->reset($this->stream + strlen($buffer));
    154                     $this->parser->getTokenizer()->clearStack();
    155                     $token = $this->parser->readValue();
    156                     if ($token === false || !($token instanceof PdfToken) || $token->value !== 'endstream') {
    157                         $this->reader->reset($this->stream, 100000);
    158                         $buffer = $this->extractStream();
    159                         $this->reader->reset($this->stream + strlen($buffer));
    160                     }
    161                 }
    162             }
    163 
     158            }
    164159            if ($cache === false) {
    165160                return $buffer;
    … …  
    171166
    172167        return $this->stream;
    173     }
    174 
    175     /**
    176      * Extract the stream "manually".
    177      *
    178      * @return string
    179      * @throws PdfTypeException
    180      */
    181     protected function extractStream()
    182     {
    183         while (true) {
    184             $buffer = $this->reader->getBuffer(false);
    185             $length = \strpos($buffer, 'endstream');
    186             if ($length === false) {
    187                 if (!$this->reader->increaseLength(100000)) {
    188                     throw new PdfTypeException('Cannot extract stream.');
    189                 }
    190                 continue;
    191             }
    192             break;
    193         }
    194 
    195         $buffer = \substr($buffer, 0, $length);
    196         $lastByte = \substr($buffer, -1);
    197 
    198         /* Check for EOL marker =
    199          *   CARRIAGE RETURN (\r) and a LINE FEED (\n) or just a LINE FEED (\n},
    200          *   and not by a CARRIAGE RETURN (\r) alone
    201          */
    202         if ($lastByte === "\n") {
    203             $buffer = \substr($buffer, 0, -1);
    204 
    205             $lastByte = \substr($buffer, -1);
    206             if ($lastByte === "\r") {
    207                 $buffer = \substr($buffer, 0, -1);
    208             }
    209         }
    210 
    211         return $buffer;
    212168    }
    213169

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Type/PdfString.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Type;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Type/PdfToken.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Type;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Type/PdfType.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Type;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfParser/Type/PdfTypeException.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfParser\Type;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfReader/DataStructure/Rectangle.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfReader\DataStructure;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfReader/Page.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfReader;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfReader/PageBoundaries.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfReader;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfReader/PdfReader.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfReader;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/PdfReader/PdfReaderException.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\PdfReader;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/Tcpdf/Fpdi.php

    r2115536 r2166154  
    3535     * @string
    3636     */
    37     const VERSION = '2.2.0';
     37    const VERSION = '2.1.1';
    3838
    3939    /**
    … …  
    5151    protected $currentObjectNumber;
    5252
    53     protected function _enddoc()
    54     {
    55         parent::_enddoc();
    56         $this->cleanUp();
    57     }
    58 
    5953    /**
    6054     * Get the next template id.
    … …  
    7064     * Draws an imported page onto the page or another template.
    7165     *
    72      * Give only one of the size parameters (width, height) to calculate the other one automatically in view to the
    73      * aspect ratio.
     66     * Omit one of the size parameters (width, height) to calculate the other one automatically in view to the aspect
     67     * ratio.
    7468     *
    7569     * @param mixed $tpl The template id
    … …  
    9185     * Draws an imported page onto the page.
    9286     *
    93      * Give only one of the size parameters (width, height) to calculate the other one automatically in view to the
    94      * aspect ratio.
     87     * Omit one of the size parameters (width, height) to calculate the other one automatically in view to the aspect
     88     * ratio.
    9589     *
    9690     * @param mixed $pageId The page id
    … …  
    118112     * Get the size of an imported page.
    119113     *
    120      * Give only one of the size parameters (width, height) to calculate the other one automatically in view to the
    121      * aspect ratio.
     114     * Omit one of the size parameters (width, height) to calculate the other one automatically in view to the aspect
     115     * ratio.
    122116     *
    123117     * @param mixed $tpl The template id

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/TcpdfFpdi.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/Tfpdf/FpdfTpl.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\Tfpdf;

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/Tfpdf/Fpdi.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010namespace setasign\Fpdi\Tfpdf;
    … …  
    3232     * @string
    3333     */
    34     const VERSION = '2.2.0';
    35 
    36     public function _enddoc()
    37     {
    38         parent::_enddoc();
    39         $this->cleanUp();
    40     }
     34    const VERSION = '2.1.1';
    4135
    4236    /**
    4337     * Draws an imported page or a template onto the page or another template.
    4438     *
    45      * Give only one of the size parameters (width, height) to calculate the other one automatically in view to the
    46      * aspect ratio.
     39     * Omit one of the size parameters (width, height) to calculate the other one automatically in view to the aspect
     40     * ratio.
    4741     *
    4842     * @param mixed $tpl The template id
    … …  
    7266     * Get the size of an imported page or template.
    7367     *
    74      * Give only one of the size parameters (width, height) to calculate the other one automatically in view to the
    75      * aspect ratio.
     68     * Omit one of the size parameters (width, height) to calculate the other one automatically in view to the aspect
     69     * ratio.
    7670     *
    7771     * @param mixed $tpl The template id

  • woo-dp-internetmarke/trunk/vendor/setasign/fpdi/src/autoload.php

    r2115536 r2166154  
    44 *
    55 * @package   setasign\Fpdi
    6  * @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
     6 * @copyright Copyright (c) 2018 Setasign - Jan Slabon (https://www.setasign.com)
    77 * @license   http://opensource.org/licenses/mit-license The MIT License
    8  */
     8  */
    99
    1010spl_autoload_register(function ($class) {

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/.gitignore

    r2115536 r2166154  
    22composer.lock
    33phpunit.xml
     4.idea

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/.php_cs

    r2115536 r2166154  
    99    ->setRules(array(
    1010        '@PSR2' => true,
    11         '@PhpCsFixer' => true,
    1211        'array_syntax' => [
    1312            'syntax' => 'short',
    … …  
    1716        'ternary_operator_spaces' => true,
    1817        'cast_spaces' => true,
    19         'trailing_comma_in_multiline_array' => true,
    20         'concat_space' => [
    21             'spacing' => 'one',
    22         ],
    23         'blank_line_before_statement' => [
    24             'statements' => [
    25                 'return',
    26                 'declare',
    27             ],
    28         ],
    29         'php_unit_test_class_requires_covers' => false,
     18        'trailing_comma_in_multiline_array' => true
    3019    ))
    3120    ->setFinder($finder);

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/.travis.yml

    r2115536 r2166154  
    1111    - 7.2
    1212
     13before_install:
     14    - composer self-update
     15
    1316install:
    1417    - composer install

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/CHANGELOG.md

    r2115536 r2166154  
    11# CHANGELOG
    2 
    3 ## 1.2.2
    4 - Merged PR #9
    5 
    6 ## 1.2.1
    7 - Fixed issue #7
    8 
    9 ## 1.2.0
    10 - Merged PR #5
    11 - Fix minor typo
    122
    133## 1.1.0

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/composer.json

    r2115536 r2166154  
    2121            "email": "[email protected]",
    2222            "role": "Contributor"
    23         },
    24         {
    25             "name": "NtlBldrv",
    26             "role": "Contributor"
    27         },
    28         {
    29             "name": "baijunyao",
    30             "email": "[email protected]",
    31             "role": "Contributor"
    3223        }
    3324    ],
    … …  
    4132    "scripts": {
    4233        "test": "vendor/bin/phpunit",
    43         "lint": "vendor/bin/php-cs-fixer fix --ansi --diff --verbose"
     34        "lint": "vendor/bin/php-cs-fixer fix"
    4435    },
    4536    "require-dev": {
    46         "friendsofphp/php-cs-fixer": "^2.0",
    47         "phpunit/phpunit": "^4.8 || ^6.0"
     37        "phpunit/phpunit": "^4.8 || ^6.0",
     38        "friendsofphp/php-cs-fixer": "^2.0"
    4839    },
    4940    "autoload" : {
    … …  
    5647            "WsdlToPhp\\WsSecurity\\Tests\\": "tests"
    5748        }
    58     },
    59     "config": {
    60         "sort-packages": true
    6149    }
    6250}

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/src/Created.php

    r2115536 r2166154  
    66{
    77    /**
    8      * Element name.
    9      *
     8     * Element name
    109     * @var string
    1110     */
    1211    const NAME = 'Created';
    13 
    1412    /**
    15      * Constructor for Created element.
    16      *
    17      * @param int    $_timestamp the timestamp value
     13     * Constructor for Created element
     14     * @param int $_timestamp the timestamp value
    1815     * @param string $_namespace the namespace
    1916     */

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/src/Element.php

    r2115536 r2166154  
    1212{
    1313    /**
    14      * Namespace for WSSE elements.
    15      *
     14     * Namespace for WSSE elements
    1615     * @var string
    1716     */
    1817    const NS_WSSE = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd';
    1918    /**
    20      * Namespace name for WSSE elements.
    21      *
     19     * Namespace name for WSSE elements
    2220     * @var string
    2321     */
    2422    const NS_WSSE_NAME = 'wsse';
    2523    /**
    26      * Namespace for WSSU elements.
    27      *
     24     * Namespace for WSSU elements
    2825     * @var string
    2926     */
    3027    const NS_WSSU = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd';
    3128    /**
    32      * Namespace name for WSSU elements.
    33      *
     29     * Namespace name for WSSU elements
    3430     * @var string
    3531     */
    3632    const NS_WSSU_NAME = 'wssu';
    3733    /**
    38      * Name of the element used as the WS-Security tag.
    39      *
     34     * Name of the element used as the WS-Security tag
    4035     * @var string
    4136     */
    … …  
    4338    /**
    4439     * Value of the element.
    45      * It can either be a string value or a Element object.
    46      *
    47      * @var Element|string
     40     * It can either be a string value or a Element object
     41     * @var string|Element
    4842     */
    4943    protected $value = '';
    5044    /**
    51      * Array of attributes that must contains the element.
    52      *
     45     * Array of attributes that must contains the element
    5346     * @var array
    5447     */
    5548    protected $attributes = [];
    5649    /**
    57      * The namespace the element belongs to.
    58      *
     50     * The namespace the element belongs to
    5951     * @var string
    6052     */
    6153    protected $namespace = '';
    6254    /**
    63      * Nonce used to generate digest password.
    64      *
    65      * @var string
    66      */
    67     protected $nonceValue;
    68     /**
    69      * Timestamp used to generate digest password.
    70      *
     55     * Nonce used to generate digest password
     56     * @var string
     57     */
     58    protected $nonceValue = null;
     59    /**
     60     * Timestamp used to generate digest password
    7161     * @var int
    7262     */
    73     protected $timestampValue;
    74     /**
    75      * Current \DOMDocument used to generate XML content.
    76      *
     63    protected $timestampValue = null;
     64    /**
     65     * Current \DOMDocument used to generate XML content
    7766     * @var \DOMDocument
    7867     */
    7968    protected static $dom = null;
    80 
    81     /**
    82      * Generic constructor.
    83      *
     69    /**
     70     * Generic constructor
    8471     * @param string $name
    8572     * @param string $namespace
    86      * @param mixed  $value
    87      * @param array  $attributes
     73     * @param mixed $value
     74     * @param array $attributes
    8875     */
    8976    public function __construct($name, $namespace, $value = null, array $attributes = [])
    … …  
    9380            ->setNamespace($namespace)
    9481            ->setValue($value)
    95             ->setAttributes($attributes)
    96         ;
    97     }
    98 
    99     /**
    100      * Method called to generate the string XML request to be sent among the SOAP Header.
    101      *
    102      * @param bool $asDomElement returns elements as a \DOMElement or as a string
    103      *
    104      * @return \DOMElement|string
    105      */
    106     protected function __toSend($asDomElement = false)
    107     {
    108         /**
    109          * Create element tag.
    110          */
    111         $element = self::getDom()->createElement($this->getNamespacedName());
    112         $element->setAttributeNS('http://www.w3.org/2000/xmlns/', sprintf('xmlns:%s', $this->getNamespacePrefix()), $this->getNamespace());
    113         /*
    114          * Define element value
    115          * Add attributes if there are any
    116          */
    117         $this
    118             ->appendValueToElementToSend($this->getValue(), $element)
    119             ->appendAttributesToElementToSend($element)
    120         ;
    121         // Returns element content
    122         if ($asDomElement) {
    123             return $element;
    124         }
    125 
    126         return self::getDom()->saveXML($element);
    127     }
    128 
     82            ->setAttributes($attributes);
     83    }
    12984    /**
    13085     * @return string
    … …  
    13489        return $this->name;
    13590    }
    136 
    13791    /**
    13892     * @param string $name
    139      *
    14093     * @return Element
    14194     */
    … …  
    14396    {
    14497        $this->name = $name;
    145 
    146         return $this;
    147     }
    148 
     98        return $this;
     99    }
    149100    /**
    150101     * @return array
    … …  
    154105        return $this->attributes;
    155106    }
    156 
    157107    /**
    158108     * @param array $attributes
    159      *
    160109     * @return Element
    161110     */
    … …  
    163112    {
    164113        $this->attributes = $attributes;
    165 
    166         return $this;
    167     }
    168 
     114        return $this;
     115    }
    169116    /**
    170117     * @param string $name
    171      * @param mixed  $value
    172      *
     118     * @param mixed $value
    173119     * @return Element
    174120     */
    … …  
    176122    {
    177123        $this->attributes[$name] = $value;
    178 
    179         return $this;
    180     }
    181 
     124        return $this;
     125    }
    182126    /**
    183127     * @return bool true|false
    … …  
    187131        return count($this->attributes) > 0;
    188132    }
    189 
    190133    /**
    191134     * @return string
    … …  
    195138        return $this->namespace;
    196139    }
    197 
    198     /**
    199      * @param string $namespace
    200      *
    201      * @return Element
    202      */
    203     public function setNamespace($namespace)
    204     {
    205         $this->namespace = $namespace;
    206 
    207         return $this;
    208     }
    209 
    210     /**
    211      * @return Element|string
    212      */
    213     public function getValue()
    214     {
    215         return $this->value;
    216     }
    217 
    218     /**
    219      * @param Element|string
    220      * @param mixed $value
    221      *
    222      * @return Element
    223      */
    224     public function setValue($value)
    225     {
    226         $this->value = $value;
    227 
    228         return $this;
    229     }
    230 
    231     /**
    232      * @return string
    233      */
    234     public function getNonceValue()
    235     {
    236         return $this->nonceValue;
    237     }
    238 
    239     /**
    240      * @param string $nonceValue
    241      *
    242      * @return Element
    243      */
    244     public function setNonceValue($nonceValue)
    245     {
    246         $this->nonceValue = $nonceValue;
    247 
    248         return $this;
    249     }
    250 
    251     /**
    252      * @param mixed $formatted
    253      *
    254      * @return int|string
    255      */
    256     public function getTimestampValue($formatted = false)
    257     {
    258         return ($formatted && $this->timestampValue > 0) ? gmdate('Y-m-d\TH:i:s\Z', $this->timestampValue) : $this->timestampValue;
    259     }
    260 
    261     /**
    262      * @param int $timestampValue
    263      *
    264      * @return Element
    265      */
    266     public function setTimestampValue($timestampValue)
    267     {
    268         $this->timestampValue = $timestampValue;
    269 
    270         return $this;
    271     }
    272 
    273     /**
    274      * Returns the element to send as WS-Security header.
    275      *
    276      * @return string
    277      */
    278     public function toSend()
    279     {
    280         self::setDom(new \DOMDocument('1.0', 'UTF-8'));
    281 
    282         return $this->__toSend();
    283     }
    284 
    285     /**
    286      * Handle adding value to element according to the value type.
    287      *
    288      * @param mixed       $value
    289      * @param \DOMElement $element
    290      *
    291      * @return Element
    292      */
    293     protected function appendValueToElementToSend($value, \DOMElement $element)
    294     {
    295         if ($value instanceof Element) {
    296             $this->appendElementToElementToSend($value, $element);
    297         } elseif (is_array($value)) {
    298             $this->appendValuesToElementToSend($value, $element);
    299         } elseif (!empty($value)) {
    300             $element->appendChild(self::getDom()->createTextNode($value));
    301         }
    302 
    303         return $this;
    304     }
    305 
    306     /**
    307      * @param Element     $element
    308      * @param \DOMElement $element
    309      */
    310     protected function appendElementToElementToSend(Element $value, \DOMElement $element)
    311     {
    312         $toSend = $value->__toSend(true);
    313         if ($toSend instanceof \DOMElement) {
    314             $element->appendChild($toSend);
    315         }
    316     }
    317 
    318     /**
    319      * @param array       $values
    320      * @param \DOMElement $element
    321      */
    322     protected function appendValuesToElementToSend(array $values, \DOMElement $element)
    323     {
    324         foreach ($values as $value) {
    325             $this->appendValueToElementToSend($value, $element);
    326         }
    327     }
    328 
    329     /**
    330      * @param \DOMElement $element
    331      *
    332      * @return Element
    333      */
    334     protected function appendAttributesToElementToSend(\DOMElement $element)
    335     {
    336         if ($this->hasAttributes()) {
    337             foreach ($this->getAttributes() as $attributeName => $attributeValue) {
    338                 $matches = [];
    339                 if (0 === preg_match(sprintf('/(%s|%s):/', self::NS_WSSU_NAME, self::NS_WSSE_NAME), $attributeName, $matches)) {
    340                     $element->setAttribute($attributeName, $attributeValue);
    341                 } else {
    342                     $element->setAttributeNS(self::NS_WSSE_NAME === $matches[1] ? self::NS_WSSE : self::NS_WSSU, $attributeName, $attributeValue);
    343                 }
    344             }
    345         }
    346 
    347         return $this;
    348     }
    349 
    350     /**
    351      * Returns the name with its namespace.
    352      *
    353      * @return string
    354      */
    355     protected function getNamespacedName()
    356     {
    357         return sprintf('%s:%s', $this->getNamespacePrefix(), $this->getName());
    358     }
    359 
    360140    /**
    361141     * @return string
    … …  
    372152                break;
    373153        }
    374 
    375154        return $namespacePrefix;
    376155    }
    377 
     156    /**
     157     * @param string $namespace
     158     * @return Element
     159     */
     160    public function setNamespace($namespace)
     161    {
     162        $this->namespace = $namespace;
     163        return $this;
     164    }
     165    /**
     166     * @return string|Element
     167     */
     168    public function getValue()
     169    {
     170        return $this->value;
     171    }
     172    /**
     173     * @param string|Element
     174     * @return Element
     175     */
     176    public function setValue($value)
     177    {
     178        $this->value = $value;
     179        return $this;
     180    }
     181    /**
     182     * @return string
     183     */
     184    public function getNonceValue()
     185    {
     186        return $this->nonceValue;
     187    }
     188    /**
     189     * @param string $nonceValue
     190     * @return Element
     191     */
     192    public function setNonceValue($nonceValue)
     193    {
     194        $this->nonceValue = $nonceValue;
     195        return $this;
     196    }
     197    /**
     198     * @return int|string
     199     */
     200    public function getTimestampValue($formated = false)
     201    {
     202        return ($formated && $this->timestampValue > 0) ? gmdate('Y-m-d\TH:i:s\Z', $this->timestampValue) : $this->timestampValue;
     203    }
     204    /**
     205     * @param int $timestampValue
     206     * @return Element
     207     */
     208    public function setTimestampValue($timestampValue)
     209    {
     210        $this->timestampValue = $timestampValue;
     211        return $this;
     212    }
    378213    /**
    379214     * @return \DOMDocument
    … …  
    383218        return self::$dom;
    384219    }
    385 
    386220    /**
    387221     * @param \DOMDocument $dom
    388      *
    389222     * @return \DOMDocument
    390223     */
    … …  
    393226        self::$dom = $dom;
    394227    }
     228    /**
     229     * Method called to generate the string XML request to be sent among the SOAP Header
     230     * @param bool $asDomElement returns elements as a \DOMElement or as a string
     231     * @return string|\DOMElement
     232     */
     233    protected function __toSend($asDomElement = false)
     234    {
     235        /**
     236         * Create element tag
     237         */
     238        $element = self::getDom()->createElement($this->getNamespacedName());
     239        $element->setAttributeNS('http://www.w3.org/2000/xmlns/', sprintf('xmlns:%s', $this->getNamespacePrefix()), $this->getNamespace());
     240        /**
     241         * Define element value
     242         * Add attributes if there are any
     243         */
     244        $this
     245            ->appendValueToElementToSend($this->getValue(), $element)
     246            ->appendAttributesToElementToSend($element);
     247        /**
     248         * Returns element content
     249         */
     250        if ($asDomElement) {
     251            return $element;
     252        } else {
     253            return self::getDom()->saveXML($element);
     254        }
     255    }
     256    /**
     257     * Handle adding value to element according to the value type
     258     * @param mixed $value
     259     * @param \DOMElement $element
     260     * @return Element
     261     */
     262    protected function appendValueToElementToSend($value, \DOMElement $element)
     263    {
     264        if ($value instanceof Element) {
     265            $this->appendElementToElementToSend($value, $element);
     266        } elseif (is_array($value)) {
     267            $this->appendValuesToElementToSend($value, $element);
     268        } elseif (!empty($value)) {
     269            $element->appendChild(self::getDom()->createTextNode($value));
     270        }
     271        return $this;
     272    }
     273    /**
     274     * @param Element $element
     275     * @param \DOMElement $element
     276     */
     277    protected function appendElementToElementToSend(Element $value, \DOMElement $element)
     278    {
     279        $toSend = $value->__toSend(true);
     280        if ($toSend instanceof \DOMElement) {
     281            $element->appendChild($toSend);
     282        }
     283    }
     284    /**
     285     * @param array $values
     286     * @param \DOMElement $element
     287     */
     288    protected function appendValuesToElementToSend(array $values, \DOMElement $element)
     289    {
     290        foreach ($values as $value) {
     291            $this->appendValueToElementToSend($value, $element);
     292        }
     293    }
     294    /**
     295     * @param \DOMElement $element
     296     * @return Element
     297     */
     298    protected function appendAttributesToElementToSend(\DOMElement $element)
     299    {
     300        if ($this->hasAttributes()) {
     301            foreach ($this->getAttributes() as $attributeName => $attributeValue) {
     302                $element->setAttribute($attributeName, $attributeValue);
     303            }
     304        }
     305        return $this;
     306    }
     307    /**
     308     * Returns the name with its namespace
     309     * @return string
     310     */
     311    protected function getNamespacedName()
     312    {
     313        return sprintf('%s:%s', $this->getNamespacePrefix(), $this->getName());
     314    }
     315    /**
     316     * Returns the element to send as WS-Security header
     317     * @return string
     318     */
     319    public function toSend()
     320    {
     321        self::setDom(new \DOMDocument('1.0', 'UTF-8'));
     322        return $this->__toSend();
     323    }
    395324}

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/src/Expires.php

    r2115536 r2166154  
    66{
    77    /**
    8      * Element name.
    9      *
     8     * Element name
    109     * @var string
    1110     */
    1211    const NAME = 'Expires';
    13 
    1412    /**
    15      * Constructor for Expires element.
    16      *
    17      * @param int    $timestamp the timestamp value
    18      * @param int    $expiresIn the expires in time
     13     * Constructor for Expires element
     14     * @param int $timestamp the timestamp value
     15     * @param int $expiresIn the expires in time
    1916     * @param string $namespace the namespace
    2017     */

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/src/Nonce.php

    r2115536 r2166154  
    66{
    77    /**
    8      * Element name.
    9      *
     8     * Element name
    109     * @var string
    1110     */
    1211    const NAME = 'Nonce';
    1312    /**
    14      * Element name.
    15      *
     13     * Element name
    1614     * @var string
    1715     */
    1816    const ATTRIBUTE_ENCODING_TYPE = 'EncodingType';
    1917    /**
    20      * Element name.
    21      *
     18     * Element name
    2219     * @var string
    2320     */
    2421    const NS_ENCODING = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary';
    25 
    2622    /**
    27      * Constructor for Nonce element.
    28      *
    29      * @param string $nonce     the nonce value
     23     * Constructor for Nonce element
     24     * @param string $nonce the nonce value
    3025     * @param string $namespace the namespace
    3126     */
    … …  
    3631        ]);
    3732    }
    38 
    3933    /**
    40      * Encode Nonce value.
    41      *
     34     * Encode Nonce value
    4235     * @param string $nonce
    43      *
    4436     * @return string
    4537     */

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/src/Password.php

    r2115536 r2166154  
    44
    55/**
    6  * Class that represents the Password element.
    7  *
     6 * Class that represents the Password element
    87 * @author WsdlToPhp Team <[email protected]>
    98 */
    … …  
    1110{
    1211    /**
    13      * Element name.
    14      *
     12     * Element name
    1513     * @var string
    1614     */
    1715    const NAME = 'Password';
    1816    /**
    19      * Element attribute type name.
    20      *
     17     * Element attribute type name
    2118     * @var string
    2219     */
    2320    const ATTRIBUTE_TYPE = 'Type';
    2421    /**
    25      * Passwor must be sent using digest.
    26      *
     22     * Passwor must be sent using digest
    2723     * @var string
    2824     */
    2925    const TYPE_PASSWORD_DIGEST = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest';
    3026    /**
    31      * Passwor must be sent in text.
    32      *
     27     * Passwor must be sent in text
    3328     * @var string
    3429     */
    3530    const TYPE_PASSWORD_TEXT = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText';
    3631    /**
    37      * TypeValue of password.
    38      *
     32     * TypeValue of password
    3933     * @var string
    4034     */
    41     protected $typeValue;
    42 
     35    protected $typeValue = null;
    4336    /**
    44      * Constructor for Password element.
    45      *
    46      * @param string $password       the password
    47      * @param string $typeValue      the typeValue
     37     * Constructor for Password element
     38     * @param string $password the password
     39     * @param string $typeValue the typeValue
    4840     * @param string $timestampValue the timestamp to use
    49      * @param string $namespace      the namespace
     41     * @param string $namespace the namespace
    5042     */
    5143    public function __construct($password, $typeValue = self::TYPE_PASSWORD_TEXT, $timestampValue = 0, $namespace = self::NS_WSSE)
    … …  
    5446            ->setTypeValue($typeValue)
    5547            ->setTimestampValue($timestampValue ? $timestampValue : time())
    56             ->setNonceValue(mt_rand())
    57         ;
     48            ->setNonceValue(mt_rand());
    5849        parent::__construct(self::NAME, $namespace, $this->convertPassword($password), [
    5950            self::ATTRIBUTE_TYPE => $typeValue,
    6051        ]);
    6152    }
    62 
    6353    /**
    64      * Returns the converted form of the password accroding to the password typeValue.
    65      *
     54     * Returns the converted form of the password accroding to the password typeValue
    6655     * @param string $password
    6756     */
    6857    public function convertPassword($password)
    6958    {
    70         if (self::TYPE_PASSWORD_DIGEST === $this->getTypeValue()) {
     59        if ($this->getTypeValue() === self::TYPE_PASSWORD_DIGEST) {
    7160            $password = $this->digestPassword($password);
    7261        }
    73 
    7462        return $password;
    7563    }
    76 
    7764    /**
    78      * When generating the password digest, we define values (nonce and timestamp) that can be used in other place.
    79      *
     65     * When generating the password digest, we define values (nonce and timestamp) that can be used in other place
    8066     * @param string $password
    8167     */
    … …  
    8773        $hash = sha1($packedNonce . $packedTimestamp . $packedPassword);
    8874        $packedHash = pack('H*', $hash);
    89 
    9075        return base64_encode($packedHash);
    9176    }
    92 
    9377    /**
    9478     * @return string
    … …  
    9882        return $this->typeValue;
    9983    }
    100 
    10184    /**
    10285     * @param string $typeValue
    103      *
    10486     * @return Password
    10587     */
    … …  
    10789    {
    10890        $this->typeValue = $typeValue;
    109 
    11091        return $this;
    11192    }

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/src/Security.php

    r2115536 r2166154  
    66{
    77    /**
    8      * Element name.
    9      *
     8     * Element name
    109     * @var string
    1110     */
    1211    const NAME = 'Security';
    1312    /**
    14      * Element attribute mustunderstand name.
    15      *
     13     * Element attribute mustunderstand name
    1614     * @var string
    1715     */
    18     const ATTRIBUTE_MUST_UNDERSTAND = ':mustunderstand';
     16    const ATTRIBUTE_MUST_UNDERSTAND = 'SOAP-ENV:mustunderstand';
    1917    /**
    20      * Element attribute mustunderstand name.
    21      *
     18     * Element attribute mustunderstand name
    2219     * @var string
    2320     */
    24     const ATTRIBUTE_ACTOR = ':actor';
     21    const ATTRIBUTE_ACTOR = 'SOAP-ENV:actor';
    2522    /**
    26      * Envelop namespace.
    27      *
    28      * @var string
    29      */
    30     const ENV_NAMESPACE = 'SOAP-ENV';
    31     /**
    32      * UsernameToken element.
    33      *
     23     * UsernameToken element
    3424     * @var UsernameToken
    3525     */
    3626    protected $usernameToken;
    3727    /**
    38      * Timestamp element.
    39      *
     28     * Timestamp element
    4029     * @var Timestamp
    4130     */
    4231    protected $timestamp;
    43 
    4432    /**
    45      * Constructor for Nonce element.
    46      *
    47      * @param bool   $mustunderstand
     33     * Constructor for Nonce element
     34     * @param bool $mustunderstand
    4835     * @param string $actor
    49      * @param string $envelopeNamespace
    50      * @param string $namespace         the namespace
     36     * @param string $namespace the namespace
    5137     */
    52     public function __construct($mustunderstand = false, $actor = null, $namespace = self::NS_WSSE, $envelopeNamespace = self::ENV_NAMESPACE)
     38    public function __construct($mustunderstand = false, $actor = null, $namespace = self::NS_WSSE)
    5339    {
    5440        parent::__construct(self::NAME, $namespace);
    55         // Sets attributes
    56         if (true === $mustunderstand) {
    57             $this->setAttribute($envelopeNamespace . self::ATTRIBUTE_MUST_UNDERSTAND, $mustunderstand);
     41        /**
     42         * Sets attributes
     43         */
     44        if ($mustunderstand === true) {
     45            $this->setAttribute(self::ATTRIBUTE_MUST_UNDERSTAND, $mustunderstand);
    5846        }
    5947        if (!empty($actor)) {
    60             $this->setAttribute($envelopeNamespace . self::ATTRIBUTE_ACTOR, $actor);
     48            $this->setAttribute(self::ATTRIBUTE_ACTOR, $actor);
    6149        }
    6250    }
    63 
    6451    /**
    65      * Overrides methods in order to set the values.
    66      *
     52     * @return UsernameToken
     53     */
     54    public function getUsernameToken()
     55    {
     56        return $this->usernameToken;
     57    }
     58    /**
     59     * @param UsernameToken $usernameToken
     60     * @return Security
     61     */
     62    public function setUsernameToken(UsernameToken $usernameToken)
     63    {
     64        $this->usernameToken = $usernameToken;
     65        return $this;
     66    }
     67    /**
     68     * @return Timestamp
     69     */
     70    public function getTimestamp()
     71    {
     72        return $this->timestamp;
     73    }
     74    /**
     75     * @param Timestamp $timestamp
     76     * @return Security
     77     */
     78    public function setTimestamp(Timestamp $timestamp)
     79    {
     80        $this->timestamp = $timestamp;
     81        return $this;
     82    }
     83    /**
     84     * Overrides methods in order to set the values
    6785     * @param bool $asDomElement returns elements as a DOMElement or as a string
    68      *
    69      * @return \DOMElement|string
     86     * @return string
    7087     */
    7188    protected function __toSend($asDomElement = false)
    … …  
    7592            $this->getTimestamp(),
    7693        ]);
    77 
    7894        return parent::__toSend($asDomElement);
    7995    }
    80 
    81     /**
    82      * @return UsernameToken
    83      */
    84     public function getUsernameToken()
    85     {
    86         return $this->usernameToken;
    87     }
    88 
    89     /**
    90      * @param UsernameToken $usernameToken
    91      *
    92      * @return Security
    93      */
    94     public function setUsernameToken(UsernameToken $usernameToken)
    95     {
    96         $this->usernameToken = $usernameToken;
    97 
    98         return $this;
    99     }
    100 
    101     /**
    102      * @return Timestamp
    103      */
    104     public function getTimestamp()
    105     {
    106         return $this->timestamp;
    107     }
    108 
    109     /**
    110      * @param Timestamp $timestamp
    111      *
    112      * @return Security
    113      */
    114     public function setTimestamp(Timestamp $timestamp)
    115     {
    116         $this->timestamp = $timestamp;
    117 
    118         return $this;
    119     }
    12096}

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/src/Timestamp.php

    r2115536 r2166154  
    66{
    77    /**
    8      * Element name.
    9      *
     8     * Element name
    109     * @var string
    1110     */
    1211    const NAME = 'Timestamp';
    1312    /**
    14      * Created element.
    15      *
     13     * Created element
    1614     * @var Created
    1715     */
    18     protected $created;
     16    protected $created = null;
    1917    /**
    20      * Created element.
    21      *
     18     * Created element
    2219     * @var Expires
    2320     */
    24     protected $expires;
    25 
     21    protected $expires = null;
    2622    /**
    27      * Constructor for Timestamp element.
    28      *
     23     * Constructor for Timestamp element
    2924     * @param string $namespace the namespace
    3025     */
    … …  
    3328        parent::__construct(self::NAME, $namespace);
    3429    }
    35 
    3630    /**
    37      * Overrides method in order to add created and expires values if they are set.
    38      *
     31     * @return Created
     32     */
     33    public function getCreated()
     34    {
     35        return $this->created;
     36    }
     37    /**
     38     * @param Created $created
     39     * @return Timestamp
     40     */
     41    public function setCreated(Created $created)
     42    {
     43        $this->created = $created;
     44        return $this;
     45    }
     46    /**
     47     * @return Expires
     48     */
     49    public function getExpires()
     50    {
     51        return $this->expires;
     52    }
     53    /**
     54     * @param Expires $expires
     55     * @return Expires
     56     */
     57    public function setExpires(Expires $expires)
     58    {
     59        $this->expires = $expires;
     60        return $this;
     61    }
     62    /**
     63     * Overrides method in order to add created and expires values if they are set
    3964     * @param bool $asDomElement returns elements as a DOMElement or as a string
    40      *
    4165     * @return string
    4266     */
    … …  
    4771            $this->getExpires(),
    4872        ]);
    49 
    5073        return parent::__toSend($asDomElement);
    5174    }
    52 
    53     /**
    54      * @return Created
    55      */
    56     public function getCreated()
    57     {
    58         return $this->created;
    59     }
    60 
    61     /**
    62      * @param Created $created
    63      *
    64      * @return Timestamp
    65      */
    66     public function setCreated(Created $created)
    67     {
    68         $this->created = $created;
    69 
    70         return $this;
    71     }
    72 
    73     /**
    74      * @return Expires
    75      */
    76     public function getExpires()
    77     {
    78         return $this->expires;
    79     }
    80 
    81     /**
    82      * @param Expires $expires
    83      *
    84      * @return Expires
    85      */
    86     public function setExpires(Expires $expires)
    87     {
    88         $this->expires = $expires;
    89 
    90         return $this;
    91     }
    9275}

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/src/Username.php

    r2115536 r2166154  
    66{
    77    /**
    8      * Element name.
    9      *
     8     * Element name
    109     * @var string
    1110     */
    1211    const NAME = 'Username';
    13 
    1412    /**
    15      * Constructor for Username element.
    16      *
    17      * @param string $username  the username
     13     * Constructor for Username element
     14     * @param string $username the username
    1815     * @param string $namespace the namespace
    1916     */

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/src/UsernameToken.php

    r2115536 r2166154  
    66{
    77    /**
    8      * Element name.
    9      *
     8     * Element name
    109     * @var string
    1110     */
    1211    const NAME = 'UsernameToken';
    1312    /**
    14      * Attribute id name.
    15      *
     13     * Attribute id name
    1614     * @var string
    1715     */
    1816    const ATTRIBUTE_ID = 'Id';
    1917    /**
    20      * Username element.
    21      *
     18     * Username element
    2219     * @var Username
    2320     */
    2421    protected $username;
    2522    /**
    26      * Password element.
    27      *
     23     * Password element
    2824     * @var Password
    2925     */
    3026    protected $password;
    3127    /**
    32      * Created element.
    33      *
     28     * Created element
    3429     * @var Created
    3530     */
    3631    protected $created;
    3732    /**
    38      * Nonce element.
    39      *
     33     * Nonce element
    4034     * @var Nonce
    4135     */
    4236    protected $nonce;
    43 
    4437    /**
    45      * Constructor for UsernameToken element.
    46      *
     38     * Constructor for UsernameToken element
    4739     * @see Element::__construct()
    48      *
    4940     * @param string $id
    5041     * @param string $namespace the namespace
    … …  
    5647        ]);
    5748    }
    58 
    5949    /**
    60      * Overrides method in order to add username, password and created values if they are set.
    61      *
     50     * @return Username
     51     */
     52    public function getUsername()
     53    {
     54        return $this->username;
     55    }
     56    /**
     57     * @param Username $username
     58     * @return UsernameToken
     59     */
     60    public function setUsername(Username $username)
     61    {
     62        $this->username = $username;
     63        return $this;
     64    }
     65    /**
     66     * @return Password
     67     */
     68    public function getPassword()
     69    {
     70        return $this->password;
     71    }
     72    /**
     73     * @param Password $password
     74     * @return UsernameToken
     75     */
     76    public function setPassword($password)
     77    {
     78        $this->password = $password;
     79        return $this;
     80    }
     81    /**
     82     * @return Created
     83     */
     84    public function getCreated()
     85    {
     86        return $this->created;
     87    }
     88    /**
     89     * @param Created $created
     90     * @return UsernameToken
     91     */
     92    public function setCreated($created)
     93    {
     94        $this->created = $created;
     95        return $this;
     96    }
     97    /**
     98     * @return Nonce
     99     */
     100    public function getNonce()
     101    {
     102        return $this->nonce;
     103    }
     104    /**
     105     * @param Nonce $nonce
     106     * @return UsernameToken
     107     */
     108    public function setNonce($nonce)
     109    {
     110        $this->nonce = $nonce;
     111        return $this;
     112    }
     113    /**
     114     * Overrides method in order to add username, password and created values if they are set
    62115     * @param bool $asDomElement returns elements as a DOMElement or as a string
    63      *
    64116     * @return string
    65117     */
    … …  
    72124            $this->getNonce(),
    73125        ]);
    74 
    75126        return parent::__toSend($asDomElement);
    76127    }
    77 
    78     /**
    79      * @return Username
    80      */
    81     public function getUsername()
    82     {
    83         return $this->username;
    84     }
    85 
    86     /**
    87      * @param Username $username
    88      *
    89      * @return UsernameToken
    90      */
    91     public function setUsername(Username $username)
    92     {
    93         $this->username = $username;
    94 
    95         return $this;
    96     }
    97 
    98     /**
    99      * @return Password
    100      */
    101     public function getPassword()
    102     {
    103         return $this->password;
    104     }
    105 
    106     /**
    107      * @param Password $password
    108      *
    109      * @return UsernameToken
    110      */
    111     public function setPassword($password)
    112     {
    113         $this->password = $password;
    114 
    115         return $this;
    116     }
    117 
    118     /**
    119      * @return Created
    120      */
    121     public function getCreated()
    122     {
    123         return $this->created;
    124     }
    125 
    126     /**
    127      * @param Created $created
    128      *
    129      * @return UsernameToken
    130      */
    131     public function setCreated($created)
    132     {
    133         $this->created = $created;
    134 
    135         return $this;
    136     }
    137 
    138     /**
    139      * @return Nonce
    140      */
    141     public function getNonce()
    142     {
    143         return $this->nonce;
    144     }
    145 
    146     /**
    147      * @param Nonce $nonce
    148      *
    149      * @return UsernameToken
    150      */
    151     public function setNonce($nonce)
    152     {
    153         $this->nonce = $nonce;
    154 
    155         return $this;
    156     }
    157128}

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/src/WsSecurity.php

    r2115536 r2166154  
    99     */
    1010    protected $security;
    11 
    1211    /**
    1312     * @param string $username
    1413     * @param string $password
    15      * @param bool   $passwordDigest
    16      * @param int    $addCreated
    17      * @param int    $addExpires
    18      * @param bool   $mustunderstand
     14     * @param bool $passwordDigest
     15     * @param int $addCreated
     16     * @param int $addExpires
     17     * @param bool $mustunderstand
    1918     * @param string $actor
    2019     * @param string $usernameId
    21      * @param bool   $addNonce
    22      * @param string $envelopeNamespace
     20     * @param bool $addNonce
    2321     */
    24     protected function __construct(
    25         $username,
    26         $password,
    27         $passwordDigest = false,
    28         $addCreated = 0,
    29         $addExpires = 0,
    30         $mustunderstand = false,
    31         $actor = null,
    32         $usernameId = null,
    33         $addNonce = true,
    34         $envelopeNamespace = Security::ENV_NAMESPACE
    35     ) {
     22    protected function __construct($username, $password, $passwordDigest = false, $addCreated = 0, $addExpires = 0, $mustunderstand = false, $actor = null, $usernameId = null, $addNonce = true)
     23    {
    3624        $this
    37             ->initSecurity($mustunderstand, $actor, $envelopeNamespace)
     25            ->initSecurity($mustunderstand, $actor)
    3826            ->setUsernameToken($username, $usernameId)
    3927            ->setPassword($password, $passwordDigest, $addCreated)
    4028            ->setNonce($addNonce)
    4129            ->setCreated($addCreated)
    42             ->setTimestamp($addCreated, $addExpires)
    43         ;
     30            ->setTimestamp($addCreated, $addExpires);
    4431    }
    45 
     32    /**
     33     * @param bool $mustunderstand
     34     * @param string $actor
     35     * @return WsSecurity
     36     */
     37    protected function initSecurity($mustunderstand = false, $actor = null)
     38    {
     39        $this->security = new Security($mustunderstand, $actor);
     40        return $this;
     41    }
    4642    /**
    4743     * @return Security
    … …  
    5147        return $this->security;
    5248    }
    53 
    5449    /**
    5550     * Create the SoapHeader object to send as SoapHeader in the SOAP request.
    56      *
    5751     * @param string $username
    5852     * @param string $password
    59      * @param bool   $passwordDigest
    60      * @param int    $addCreated
    61      * @param int    $addExpires
    62      * @param bool   $returnSoapHeader
    63      * @param bool   $mustunderstand
     53     * @param bool $passwordDigest
     54     * @param int $addCreated
     55     * @param int $addExpires
     56     * @param bool $mustunderstand
    6457     * @param string $actor
    6558     * @param string $usernameId
    66      * @param bool   $addNonce
    67      * @param string $envelopeNamespace
    68      *
     59     * @param bool $addNonce
    6960     * @return \SoapHeader|\SoapVar
    7061     */
    71     public static function createWsSecuritySoapHeader(
    72         $username,
    73         $password,
    74         $passwordDigest = false,
    75         $addCreated = 0,
    76         $addExpires = 0,
    77         $returnSoapHeader = true,
    78         $mustunderstand = false,
    79         $actor = null,
    80         $usernameId = null,
    81         $addNonce = true,
    82         $envelopeNamespace = Security::ENV_NAMESPACE
    83     ) {
    84         $self = new WsSecurity($username, $password, $passwordDigest, $addCreated, $addExpires, $mustunderstand, $actor, $usernameId, $addNonce, $envelopeNamespace);
     62    public static function createWsSecuritySoapHeader($username, $password, $passwordDigest = false, $addCreated = 0, $addExpires = 0, $returnSoapHeader = true, $mustunderstand = false, $actor = null, $usernameId = null, $addNonce = true)
     63    {
     64        $self = new WsSecurity($username, $password, $passwordDigest, $addCreated, $addExpires, $mustunderstand, $actor, $usernameId, $addNonce);
    8565        if ($returnSoapHeader) {
    8666            if (!empty($actor)) {
    8767                return new \SoapHeader(Element::NS_WSSE, 'Security', new \SoapVar($self->getSecurity()->toSend(), XSD_ANYXML), $mustunderstand, $actor);
     68            } else {
     69                return new \SoapHeader(Element::NS_WSSE, 'Security', new \SoapVar($self->getSecurity()->toSend(), XSD_ANYXML), $mustunderstand);
    8870            }
    89 
    90             return new \SoapHeader(Element::NS_WSSE, 'Security', new \SoapVar($self->getSecurity()->toSend(), XSD_ANYXML), $mustunderstand);
     71        } else {
     72            return new \SoapVar($self->getSecurity()->toSend(), XSD_ANYXML);
    9173        }
    92 
    93         return new \SoapVar($self->getSecurity()->toSend(), XSD_ANYXML);
    9474    }
    95 
    96     /**
    97      * @param bool   $mustunderstand
    98      * @param string $actor
    99      * @param string $envelopeNamespace
    100      *
    101      * @return WsSecurity
    102      */
    103     protected function initSecurity($mustunderstand = false, $actor = null, $envelopeNamespace = Security::ENV_NAMESPACE)
    104     {
    105         $this->security = new Security($mustunderstand, $actor, Security::NS_WSSE, $envelopeNamespace);
    106 
    107         return $this;
    108     }
    109 
    11075    /**
    11176     * @param string $username
    11277     * @param string $usernameId
    113      *
    11478     * @return WsSecurity
    11579     */
    … …  
    11983        $usernameToken->setUsername(new Username($username));
    12084        $this->security->setUsernameToken($usernameToken);
    121 
    12285        return $this;
    12386    }
    124 
    12587    /**
    12688     * @param string $password
    127      * @param bool   $passwordDigest
    128      * @param int    $addCreated
    129      *
     89     * @param bool $passwordDigest
     90     * @param int $addCreated
    13091     * @return WsSecurity
    13192     */
    … …  
    13394    {
    13495        $this->getUsernameToken()->setPassword(new Password($password, $passwordDigest ? Password::TYPE_PASSWORD_DIGEST : Password::TYPE_PASSWORD_TEXT, is_bool($addCreated) ? 0 : ($addCreated > 0 ? $addCreated : 0)));
    135 
    13696        return $this;
    13797    }
    138 
    13998    /**
    140      * @param bool $addNonce
    141      *
     99     * @param  bool $addNonce
    142100     * @return WsSecurity
    143101     */
    … …  
    150108            }
    151109        }
    152 
    153110        return $this;
    154111    }
    155 
    156112    /**
    157113     * @param int $addCreated
    158      *
    159114     * @return WsSecurity
    160115     */
    … …  
    163118        $passwordDigest = $this->getPassword()->getTypeValue();
    164119        $timestampValue = $this->getPassword()->getTimestampValue();
    165         if (($addCreated || Password::TYPE_PASSWORD_DIGEST === $passwordDigest) && $timestampValue > 0) {
     120        if (($addCreated || $passwordDigest === Password::TYPE_PASSWORD_DIGEST) && $timestampValue > 0) {
    166121            $this->getUsernameToken()->setCreated(new Created($timestampValue));
    167122        }
    168 
    169123        return $this;
    170124    }
    171 
    172125    /**
    173126     * @param int $addCreated
    174127     * @param int $addExpires
    175      *
    176128     * @return WsSecurity
    177129     */
    … …  
    185137            $this->security->setTimestamp($timestamp);
    186138        }
    187 
    188139        return $this;
    189140    }
    190 
    191141    /**
    192142     * @return UsernameToken
    … …  
    196146        return $this->security->getUsernameToken();
    197147    }
    198 
    199148    /**
    200149     * @return Password

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/tests/TestCase.php

    r2115536 r2166154  
    11<?php
    2 
    32namespace WsdlToPhp\WsSecurity\Tests;
    43
    … …  
    1514        ], '', $string)));
    1615    }
    17 
    1816    public static function assertMatches($pattern, $string)
    1917    {
    20         return parent::assertRegExp(sprintf('/%s/', str_replace('/', '\/', $pattern)), $string);
     18        return parent::assertTrue(preg_match('/' . str_replace('/', '\/', $pattern) . '/', $string) > 0, $string);
    2119    }
    2220}

  • woo-dp-internetmarke/trunk/vendor/wsdltophp/wssecurity/tests/WsSecurityTest.php

    r2115536 r2166154  
    11<?php
    2 
    32namespace WsdlToPhp\WsSecurity\Tests;
    43
     4use WsdlToPhp\WsSecurity\Tests\TestCase;
    55use WsdlToPhp\WsSecurity\WsSecurity;
    66
    7 /**
    8  * @internal
    9  */
    10 final class WsSecurityTest extends TestCase
     7class WsSecurityTest extends TestCase
    118{
    129    public function testCreateWithExpiresIn()
    … …  
    2825        </wsse:Security>'), $header->data->enc_value);
    2926    }
    30 
    3127    public function testCreateWithoutExpiresIn()
    3228    {
    … …  
    4339        </wsse:Security>'), $header->data->enc_value);
    4440    }
    45 
    4641    public function testCreateWithMustUnderstand()
    4742    {
    … …  
    5853        </wsse:Security>'), $header->data->enc_value);
    5954    }
    60 
    6155    public function testCreateWithMustUnderstandAndActor()
    6256    {
    … …  
    7367        </wsse:Security>'), $header->data->enc_value);
    7468    }
    75 
    7669    public function testCreateSoapVar()
    7770    {
    … …  
    8881        </wsse:Security>'), $header->enc_value);
    8982    }
    90 
    9183    public function testCreateWithPasswordDigest()
    9284    {
    … …  
    10395        </wsse:Security>'), $header->enc_value);
    10496    }
    105 
    10697    public function testCreateWithUsernameId()
    10798    {
    … …  
    110101        $this->assertMatches(self::innerTrim('
    111102        <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" SOAP-ENV:mustunderstand="1" SOAP-ENV:actor="BAR">
    112             <wsse:UsernameToken xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wssu:Id="X90I3u8">
     103            <wsse:UsernameToken wssu:Id="X90I3u8">
    113104                <wsse:Username>foo</wsse:Username>
    114105                <wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">bar</wsse:Password>
    … …  
    118109        </wsse:Security>'), $header->data->enc_value);
    119110    }
    120 
    121111    public function testCreateWithoutNonce()
    122112    {
    … …  
    125115        $this->assertMatches(self::innerTrim('
    126116        <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" SOAP-ENV:mustunderstand="1" SOAP-ENV:actor="BAR">
    127             <wsse:UsernameToken xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wssu:Id="X90I3u8">
     117            <wsse:UsernameToken wssu:Id="X90I3u8">
    128118                <wsse:Username>foo</wsse:Username>
    129119                <wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">bar</wsse:Password>
    … …  
    132122        </wsse:Security>'), $header->data->enc_value);
    133123    }
    134 
    135     public function testCreateWithEnvelopeNamespace()
    136     {
    137         $header = WsSecurity::createWsSecuritySoapHeader(
    138             'foo',
    139             'bar',
    140             false,
    141             1459451824,
    142             0,
    143             true,
    144             true,
    145             'BAR',
    146             null,
    147             true,
    148             'env'
    149         );
    150 
    151         $this->assertInstanceOf('\SoapHeader', $header);
    152         $this->assertMatches(self::innerTrim('
    153         <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" env:mustunderstand="1" env:actor="BAR">
    154             <wsse:UsernameToken>
    155                 <wsse:Username>foo</wsse:Username>
    156                 <wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">bar</wsse:Password>
    157                 <wssu:Created xmlns:wssu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2016-03-31T19:17:04Z</wssu:Created>
    158                 <wsse:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">([a-zA-Z0-9=]*)</wsse:Nonce>
    159             </wsse:UsernameToken>
    160         </wsse:Security>'), $header->data->enc_value);
    161     }
    162124}
Note: See TracChangeset for help on using the changeset viewer.