From 050c7125f9ae595e8ae7cdc7f5a81b52df031f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Klatt?= Date: Wed, 2 Nov 2016 09:39:50 +0000 Subject: [PATCH 1/9] Improve coverage report generation --- codeception.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codeception.yml b/codeception.yml index 7eb8eafb1..0c9cf97a6 100644 --- a/codeception.yml +++ b/codeception.yml @@ -29,7 +29,7 @@ coverage: enabled: true remote: true c3_url: 'http://zed.de.spryker.dev' - whitelist: { include: ['src/*.php'] } + whitelist: { include: ['src/Pyz/*.php'] } extensions: enabled: From ab66948b90956e5db5198c5d088003e8a1255789 Mon Sep 17 00:00:00 2001 From: mscherer Date: Fri, 4 Nov 2016 10:45:56 +0100 Subject: [PATCH 2/9] Update composer lock --- composer.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.lock b/composer.lock index 8eced4460..269a6e64d 100644 --- a/composer.lock +++ b/composer.lock @@ -1212,7 +1212,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "85639debba3b435b000c28563c834ce31a309f17" + "reference": "5b9de0a2af2af9f924986bc699eef37149157317" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1339,13 +1339,13 @@ "Spryker\\Zed\\Customer\\": "Bundles/Customer/src", "Unit\\Spryker\\Zed\\Customer\\": "Bundles/Customer/tests", "Functional\\Spryker\\Zed\\Customer\\": "Bundles/Customer/tests", + "Spryker\\Client\\Currency\\": "Bundles/Currency/src", "Spryker\\Zed\\Currency\\": "Bundles/Currency/src", "Spryker\\Yves\\Currency\\": "Bundles/Currency/src", "Spryker\\Shared\\Currency\\": "Bundles/Currency/src", + "Functional\\Client\\Currency\\": "Bundles/Currency/tests", "Functional\\Zed\\Currency\\": "Bundles/Currency/tests", "Functional\\Yves\\Currency\\": "Bundles/Currency/tests", - "Unit\\Yves\\Currency\\": "Bundles/Currency/tests", - "Unit\\Zed\\Currency\\": "Bundles/Currency/tests", "Unit\\Shared\\Currency\\": "Bundles/Currency/tests", "Spryker\\Shared\\CustomerMailConnector\\": "Bundles/CustomerMailConnector/src", "Unit\\Spryker\\Shared\\CustomerMailConnector\\": "Bundles/CustomerMailConnector/tests", @@ -1741,7 +1741,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-11-01 17:15:06" + "time": "2016-11-04 09:38:27" }, { "name": "symfony-cmf/routing", @@ -5915,16 +5915,16 @@ }, { "name": "spryker/code-sniffer", - "version": "0.6.6", + "version": "0.6.7", "source": { "type": "git", "url": "https://github.com/spryker/code-sniffer.git", - "reference": "cd4bea48db6f99b3d13eefe3afbe256528c23c97" + "reference": "af8c442f30d136197414f446e753937dee8fb556" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/code-sniffer/zipball/cd4bea48db6f99b3d13eefe3afbe256528c23c97", - "reference": "cd4bea48db6f99b3d13eefe3afbe256528c23c97", + "url": "https://api.github.com/repos/spryker/code-sniffer/zipball/af8c442f30d136197414f446e753937dee8fb556", + "reference": "af8c442f30d136197414f446e753937dee8fb556", "shasum": "" }, "require": { @@ -5958,7 +5958,7 @@ "phpcs", "standards" ], - "time": "2016-10-21 09:32:31" + "time": "2016-10-31 09:09:05" }, { "name": "squizlabs/php_codesniffer", From a723e961f005436925dd0f98cb978661a463e9b6 Mon Sep 17 00:00:00 2001 From: mscherer Date: Fri, 4 Nov 2016 13:25:10 +0100 Subject: [PATCH 3/9] Fixed XSDs for XML validation. --- composer.lock | 4 ++-- config/Zed/StateMachine/Test/Invoice01.xml | 9 ++++++--- config/Zed/navigation.xml | 2 +- config/Zed/oms/Nopayment01.xml | 14 +++++++------- .../Shared/Customer/Transfer/customer.transfer.xml | 4 ++-- src/Pyz/Shared/Sales/Transfer/sales.transfer.xml | 4 ++-- src/Pyz/Shared/Search/Transfer/search.transfer.xml | 5 +++-- .../Propel/Schema/spy_customer.schema.xml | 2 +- .../Schema/spy_state_machine_example.schema.xml | 2 +- 9 files changed, 25 insertions(+), 21 deletions(-) diff --git a/composer.lock b/composer.lock index 269a6e64d..c62530535 100644 --- a/composer.lock +++ b/composer.lock @@ -1212,7 +1212,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "5b9de0a2af2af9f924986bc699eef37149157317" + "reference": "4f05ca1964fb512c4596675ad5577a3981307e6b" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1741,7 +1741,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-11-04 09:38:27" + "time": "2016-11-08 09:59:15" }, { "name": "symfony-cmf/routing", diff --git a/config/Zed/StateMachine/Test/Invoice01.xml b/config/Zed/StateMachine/Test/Invoice01.xml index 89f767abf..802a1ab78 100644 --- a/config/Zed/StateMachine/Test/Invoice01.xml +++ b/config/Zed/StateMachine/Test/Invoice01.xml @@ -1,10 +1,12 @@ - + + xsi:schemaLocation="spryker:state-machine http://static.spryker.com/state-machine-01.xsd"> + + @@ -127,6 +129,7 @@ item not returned + diff --git a/config/Zed/navigation.xml b/config/Zed/navigation.xml index 699465cc8..f7a770343 100644 --- a/config/Zed/navigation.xml +++ b/config/Zed/navigation.xml @@ -1,4 +1,4 @@ - + diff --git a/config/Zed/oms/Nopayment01.xml b/config/Zed/oms/Nopayment01.xml index a80f201a2..8f57e2584 100644 --- a/config/Zed/oms/Nopayment01.xml +++ b/config/Zed/oms/Nopayment01.xml @@ -1,10 +1,12 @@ - + + xmlns="spryker:oms" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="spryker:oms http://static.spryker.com/oms-01.xsd"> + + @@ -71,11 +73,9 @@ returned return - - @@ -83,8 +83,8 @@ - + diff --git a/src/Pyz/Shared/Customer/Transfer/customer.transfer.xml b/src/Pyz/Shared/Customer/Transfer/customer.transfer.xml index 9b49aacc2..7c524b976 100644 --- a/src/Pyz/Shared/Customer/Transfer/customer.transfer.xml +++ b/src/Pyz/Shared/Customer/Transfer/customer.transfer.xml @@ -1,7 +1,7 @@ - + xsi:schemaLocation="spryker:transfer http://static.spryker.com/transfer-01.xsd" > diff --git a/src/Pyz/Shared/Sales/Transfer/sales.transfer.xml b/src/Pyz/Shared/Sales/Transfer/sales.transfer.xml index 15e62c5c7..b6c330472 100644 --- a/src/Pyz/Shared/Sales/Transfer/sales.transfer.xml +++ b/src/Pyz/Shared/Sales/Transfer/sales.transfer.xml @@ -1,7 +1,7 @@ - + xsi:schemaLocation="spryker:transfer http://static.spryker.com/transfer-01.xsd" > diff --git a/src/Pyz/Shared/Search/Transfer/search.transfer.xml b/src/Pyz/Shared/Search/Transfer/search.transfer.xml index 285e98200..d5ff47bb9 100644 --- a/src/Pyz/Shared/Search/Transfer/search.transfer.xml +++ b/src/Pyz/Shared/Search/Transfer/search.transfer.xml @@ -1,9 +1,10 @@ - + xsi:schemaLocation="spryker:transfer http://static.spryker.com/transfer-01.xsd" > + diff --git a/src/Pyz/Zed/Customer/Persistence/Propel/Schema/spy_customer.schema.xml b/src/Pyz/Zed/Customer/Persistence/Propel/Schema/spy_customer.schema.xml index 31357b075..0b3a4841f 100644 --- a/src/Pyz/Zed/Customer/Persistence/Propel/Schema/spy_customer.schema.xml +++ b/src/Pyz/Zed/Customer/Persistence/Propel/Schema/spy_customer.schema.xml @@ -1,5 +1,5 @@ - + diff --git a/src/Pyz/Zed/StateMachineExample/Persistence/Propel/Schema/spy_state_machine_example.schema.xml b/src/Pyz/Zed/StateMachineExample/Persistence/Propel/Schema/spy_state_machine_example.schema.xml index 1a9b80cde..ee88e5f74 100644 --- a/src/Pyz/Zed/StateMachineExample/Persistence/Propel/Schema/spy_state_machine_example.schema.xml +++ b/src/Pyz/Zed/StateMachineExample/Persistence/Propel/Schema/spy_state_machine_example.schema.xml @@ -1,5 +1,5 @@ - +
From 72576a8e732f0e969eef57ef6f8a27895b7dbc1a Mon Sep 17 00:00:00 2001 From: mscherer Date: Tue, 8 Nov 2016 11:31:42 +0100 Subject: [PATCH 4/9] Update composer lock --- composer.lock | 90 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 85 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index c62530535..1aee00ea6 100644 --- a/composer.lock +++ b/composer.lock @@ -523,7 +523,7 @@ "time": "2015-09-22 13:58:03" }, { - "name": "mathiasverraes/money", + "name": "moneyphp/money", "version": "v3.0.0", "source": { "type": "git", @@ -598,7 +598,6 @@ "money", "vo" ], - "abandoned": "moneyphp/money", "time": "2016-10-26 08:11:59" }, { @@ -1212,11 +1211,11 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "4f05ca1964fb512c4596675ad5577a3981307e6b" + "reference": "688625f5bf5283bfdcf572de7101c82242b33e6d" }, "require": { "everon/criteria-builder": "^1.1.0", - "mathiasverraes/money": "~3.0.0-beta2", + "moneyphp/money": "~3.0.0", "paragonie/random_compat": "~1.2.1", "phpdocumentor/graphviz": "~1.0.4" }, @@ -1454,9 +1453,11 @@ "Unit\\Spryker\\Shared\\Messenger\\": "Bundles/Messenger/tests", "Spryker\\Zed\\Messenger\\": "Bundles/Messenger/src", "Unit\\Spryker\\Zed\\Messenger\\": "Bundles/Messenger/tests", + "Spryker\\Client\\Money\\": "Bundles/Money/src", "Spryker\\Shared\\Money\\": "Bundles/Money/src", "Spryker\\Yves\\Money\\": "Bundles/Money/src", "Spryker\\Zed\\Money\\": "Bundles/Money/src", + "Unit\\Spryker\\Client\\Money\\": "Bundles/Money/tests", "Unit\\Spryker\\Shared\\Money\\": "Bundles/Money/tests", "Unit\\Spryker\\Yves\\Money\\": "Bundles/Money/tests", "Unit\\Spryker\\Zed\\Money\\": "Bundles/Money/tests", @@ -1741,7 +1742,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-11-08 09:59:15" + "time": "2016-11-08 10:28:16" }, { "name": "symfony-cmf/routing", @@ -4186,6 +4187,85 @@ ], "time": "2016-10-12 01:52:42" }, + { + "name": "mathiasverraes/money", + "version": "v3.0.0", + "source": { + "type": "git", + "url": "https://github.com/moneyphp/money.git", + "reference": "ffd114125b7ed474201e67fe060ea605debfb66e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/moneyphp/money/zipball/ffd114125b7ed474201e67fe060ea605debfb66e", + "reference": "ffd114125b7ed474201e67fe060ea605debfb66e", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "cache/taggable-cache": "^0.4.0", + "ext-bcmath": "*", + "ext-gmp": "*", + "ext-intl": "*", + "florianv/swap": "^3.0", + "henrikbjorn/phpspec-code-coverage": "^2.0.2", + "moneyphp/iso-currencies": "^1.0", + "php-http/message": "^1.4", + "php-http/mock-client": "^0.3.3", + "phpspec/phpspec": "^2.5", + "phpunit/phpunit": "^4.5", + "psr/cache": "^1.0", + "sllh/php-cs-fixer-styleci-bridge": "^2.1" + }, + "suggest": { + "ext-bcmath": "Calculate without integer limits", + "ext-gmp": "Calculate without integer limits", + "ext-intl": "Format Money objects with intl", + "florianv/swap": "Exchange rates library for PHP", + "psr/cache-implementation": "Used for Currency caching" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Money\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mathias Verraes", + "email": "mathias@verraes.net", + "homepage": "http://verraes.net" + }, + { + "name": "Frederik Bosch", + "email": "f.bosch@genkgo.nl" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagi-kazar@gmail.com" + } + ], + "description": "PHP implementation of Fowler's Money pattern", + "homepage": "http://verraes.net/2011/04/fowler-money-pattern-in-php/", + "keywords": [ + "Value Object", + "money", + "vo" + ], + "abandoned": "moneyphp/money", + "time": "2016-10-26 08:11:59" + }, { "name": "myclabs/deep-copy", "version": "1.5.5", From 9e0d8e3787cc8d0f8498ea579ba345d6b4217a05 Mon Sep 17 00:00:00 2001 From: mscherer Date: Tue, 8 Nov 2016 11:36:02 +0100 Subject: [PATCH 5/9] Update composer lock --- c3.php | 280 -------------------------------------------------- composer.lock | 79 -------------- 2 files changed, 359 deletions(-) delete mode 100644 c3.php diff --git a/c3.php b/c3.php deleted file mode 100644 index 4946e2249..000000000 --- a/c3.php +++ /dev/null @@ -1,280 +0,0 @@ - $value) { - $_SERVER["HTTP_X_CODECEPTION_" . strtoupper($key)] = $value; - } - } -} - -if (!array_key_exists('HTTP_X_CODECEPTION_CODECOVERAGE', $_SERVER)) { - return; -} - -if (!function_exists('__c3_error')) { - function __c3_error($message) - { - $errorLogFile = defined('C3_CODECOVERAGE_ERROR_LOG_FILE') ? - C3_CODECOVERAGE_ERROR_LOG_FILE : - C3_CODECOVERAGE_MEDIATE_STORAGE . DIRECTORY_SEPARATOR . 'error.txt'; - if (is_writable($errorLogFile)) { - file_put_contents($errorLogFile, $message); - } else { - $message = "Could not write error to log file ($errorLogFile), original message: $message"; - } - if (!headers_sent()) { - header('X-Codeception-CodeCoverage-Error: ' . str_replace("\n", ' ', $message), true, 500); - } - setcookie('CODECEPTION_CODECOVERAGE_ERROR', $message); - } -} - -// phpunit codecoverage shimming -if (class_exists('SebastianBergmann\CodeCoverage\CodeCoverage')) { - class_alias('SebastianBergmann\CodeCoverage\CodeCoverage', 'PHP_CodeCoverage'); - class_alias('SebastianBergmann\CodeCoverage\Report\Text', 'PHP_CodeCoverage_Report_Text'); - class_alias('SebastianBergmann\CodeCoverage\Report\PHP', 'PHP_CodeCoverage_Report_PHP'); - class_alias('SebastianBergmann\CodeCoverage\Report\Clover', 'PHP_CodeCoverage_Report_Clover'); - class_alias('SebastianBergmann\CodeCoverage\Report\Html\Facade', 'PHP_CodeCoverage_Report_HTML'); - class_alias('SebastianBergmann\CodeCoverage\Exception', 'PHP_CodeCoverage_Exception'); -} - -// Autoload Codeception classes -if (!class_exists('\\Codeception\\Codecept')) { - if (file_exists(__DIR__ . '/codecept.phar')) { - require_once 'phar://' . __DIR__ . '/codecept.phar/autoload.php'; - } elseif (stream_resolve_include_path(__DIR__ . '/vendor/autoload.php')) { - require_once __DIR__ . '/vendor/autoload.php'; - // Required to load some methods only available at codeception/autoload.php - if (stream_resolve_include_path(__DIR__ . '/vendor/codeception/codeception/autoload.php')) { - require_once __DIR__ . '/vendor/codeception/codeception/autoload.php'; - } - } elseif (stream_resolve_include_path('Codeception/autoload.php')) { - require_once 'Codeception/autoload.php'; - } else { - __c3_error('Codeception is not loaded. Please check that either PHAR or Composer package can be used'); - } -} - -// Load Codeception Config -$config_dist_file = realpath(__DIR__) . DIRECTORY_SEPARATOR . 'codeception.dist.yml'; -$config_file = realpath(__DIR__) . DIRECTORY_SEPARATOR . 'codeception.yml'; - -if (isset($_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE_CONFIG'])) { - $config_file = realpath(__DIR__) . DIRECTORY_SEPARATOR . $_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE_CONFIG']; -} -if (file_exists($config_file)) { - // Use codeception.yml for configuration. -} elseif (file_exists($config_dist_file)) { - // Use codeception.dist.yml for configuration. - $config_file = $config_dist_file; -} else { - __c3_error(sprintf("Codeception config file '%s' not found", $config_file)); -} -try { - \Codeception\Configuration::config($config_file); -} catch (\Exception $e) { - __c3_error($e->getMessage()); -} - -if (!defined('C3_CODECOVERAGE_MEDIATE_STORAGE')) { - - // workaround for 'zend_mm_heap corrupted' problem - gc_disable(); - - $memoryLimit = ini_get('memory_limit'); - $requiredMemory = '384M'; - if ((substr($memoryLimit, -1) === 'M' && (int)$memoryLimit < (int)$requiredMemory) - || (substr($memoryLimit, -1) === 'K' && (int)$memoryLimit < (int)$requiredMemory * 1024) - || (ctype_digit($memoryLimit) && (int)$memoryLimit < (int)$requiredMemory * 1024 * 1024) - ) { - ini_set('memory_limit', $requiredMemory); - } - - define('C3_CODECOVERAGE_MEDIATE_STORAGE', Codeception\Configuration::logDir() . 'c3tmp'); - define('C3_CODECOVERAGE_PROJECT_ROOT', Codeception\Configuration::projectDir()); - define('C3_CODECOVERAGE_TESTNAME', $_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE']); - - function __c3_build_html_report(PHP_CodeCoverage $codeCoverage, $path) - { - $writer = new PHP_CodeCoverage_Report_HTML(); - $writer->process($codeCoverage, $path . 'html'); - - if (file_exists($path . '.tar')) { - unlink($path . '.tar'); - } - - $phar = new PharData($path . '.tar'); - $phar->setSignatureAlgorithm(Phar::SHA1); - $files = $phar->buildFromDirectory($path . 'html'); - array_map('unlink', $files); - - if (in_array('GZ', Phar::getSupportedCompression())) { - if (file_exists($path . '.tar.gz')) { - unlink($path . '.tar.gz'); - } - - $phar->compress(\Phar::GZ); - - // close the file so that we can rename it - unset($phar); - - unlink($path . '.tar'); - rename($path . '.tar.gz', $path . '.tar'); - } - - return $path . '.tar'; - } - - function __c3_build_clover_report(PHP_CodeCoverage $codeCoverage, $path) - { - $writer = new PHP_CodeCoverage_Report_Clover(); - $writer->process($codeCoverage, $path . '.clover.xml'); - - return $path . '.clover.xml'; - } - - function __c3_send_file($filename) - { - if (!headers_sent()) { - readfile($filename); - } - - return __c3_exit(); - } - - /** - * @param $filename - * @return null|PHP_CodeCoverage - */ - function __c3_factory($filename) - { - $phpCoverage = is_readable($filename) - ? unserialize(file_get_contents($filename)) - : new PHP_CodeCoverage(); - - - if (isset($_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE_SUITE'])) { - $suite = $_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE_SUITE']; - try { - $settings = \Codeception\Configuration::suiteSettings($suite, \Codeception\Configuration::config()); - } catch (Exception $e) { - __c3_error($e->getMessage()); - } - } else { - $settings = \Codeception\Configuration::config(); - } - - try { - \Codeception\Coverage\Filter::setup($phpCoverage) - ->whiteList($settings) - ->blackList($settings); - } catch (Exception $e) { - __c3_error($e->getMessage()); - } - - return $phpCoverage; - } - - function __c3_exit() - { - if (!isset($_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE_DEBUG'])) { - exit; - } - return null; - } - - function __c3_clear() - { - \Codeception\Util\FileSystem::doEmptyDir(C3_CODECOVERAGE_MEDIATE_STORAGE); - } -} - -if (!is_dir(C3_CODECOVERAGE_MEDIATE_STORAGE)) { - if (mkdir(C3_CODECOVERAGE_MEDIATE_STORAGE, 0777, true) === false) { - __c3_error('Failed to create directory "' . C3_CODECOVERAGE_MEDIATE_STORAGE . '"'); - } -} - -// evaluate base path for c3-related files -$path = realpath(C3_CODECOVERAGE_MEDIATE_STORAGE) . DIRECTORY_SEPARATOR . 'codecoverage'; - -$requested_c3_report = (strpos($_SERVER['REQUEST_URI'], 'c3/report') !== false); - -$complete_report = $current_report = $path . '.serialized'; -if ($requested_c3_report) { - set_time_limit(0); - - $route = ltrim(strrchr($_SERVER['REQUEST_URI'], '/'), '/'); - - if ($route == 'clear') { - __c3_clear(); - return __c3_exit(); - } - - $codeCoverage = __c3_factory($complete_report); - - switch ($route) { - case 'html': - try { - __c3_send_file(__c3_build_html_report($codeCoverage, $path)); - } catch (Exception $e) { - __c3_error($e->getMessage()); - } - return __c3_exit(); - case 'clover': - try { - __c3_send_file(__c3_build_clover_report($codeCoverage, $path)); - } catch (Exception $e) { - __c3_error($e->getMessage()); - } - return __c3_exit(); - case 'serialized': - try { - __c3_send_file($complete_report); - } catch (Exception $e) { - __c3_error($e->getMessage()); - } - return __c3_exit(); - } - -} else { - $codeCoverage = __c3_factory($current_report); - $codeCoverage->start(C3_CODECOVERAGE_TESTNAME); - if (!array_key_exists('HTTP_X_CODECEPTION_CODECOVERAGE_DEBUG', $_SERVER)) { - register_shutdown_function( - function () use ($codeCoverage, $current_report) { - - $codeCoverage->stop(); - if (!file_exists(dirname($current_report))) { // verify directory exists - if (!mkdir(dirname($current_report), 0777, true)) { - __c3_error("Can't write CodeCoverage report into $current_report"); - } - } - - file_put_contents($current_report, serialize($codeCoverage)); - } - ); - } -} - -// @codeCoverageIgnoreEnd diff --git a/composer.lock b/composer.lock index 1aee00ea6..bc8b65bdd 100644 --- a/composer.lock +++ b/composer.lock @@ -4187,85 +4187,6 @@ ], "time": "2016-10-12 01:52:42" }, - { - "name": "mathiasverraes/money", - "version": "v3.0.0", - "source": { - "type": "git", - "url": "https://github.com/moneyphp/money.git", - "reference": "ffd114125b7ed474201e67fe060ea605debfb66e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/moneyphp/money/zipball/ffd114125b7ed474201e67fe060ea605debfb66e", - "reference": "ffd114125b7ed474201e67fe060ea605debfb66e", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "cache/taggable-cache": "^0.4.0", - "ext-bcmath": "*", - "ext-gmp": "*", - "ext-intl": "*", - "florianv/swap": "^3.0", - "henrikbjorn/phpspec-code-coverage": "^2.0.2", - "moneyphp/iso-currencies": "^1.0", - "php-http/message": "^1.4", - "php-http/mock-client": "^0.3.3", - "phpspec/phpspec": "^2.5", - "phpunit/phpunit": "^4.5", - "psr/cache": "^1.0", - "sllh/php-cs-fixer-styleci-bridge": "^2.1" - }, - "suggest": { - "ext-bcmath": "Calculate without integer limits", - "ext-gmp": "Calculate without integer limits", - "ext-intl": "Format Money objects with intl", - "florianv/swap": "Exchange rates library for PHP", - "psr/cache-implementation": "Used for Currency caching" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Money\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mathias Verraes", - "email": "mathias@verraes.net", - "homepage": "http://verraes.net" - }, - { - "name": "Frederik Bosch", - "email": "f.bosch@genkgo.nl" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagi-kazar@gmail.com" - } - ], - "description": "PHP implementation of Fowler's Money pattern", - "homepage": "http://verraes.net/2011/04/fowler-money-pattern-in-php/", - "keywords": [ - "Value Object", - "money", - "vo" - ], - "abandoned": "moneyphp/money", - "time": "2016-10-26 08:11:59" - }, { "name": "myclabs/deep-copy", "version": "1.5.5", From 6eb553ea3ea1065bb63a57025654797c560a492d Mon Sep 17 00:00:00 2001 From: mscherer Date: Tue, 8 Nov 2016 13:48:41 +0100 Subject: [PATCH 6/9] Update composer lock --- .gitignore | 1 + composer.lock | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eb5524487..c65faa2ef 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ npm-debug.log # tools composer.phar +c3.php diff --git a/composer.lock b/composer.lock index bc8b65bdd..76735ceac 100644 --- a/composer.lock +++ b/composer.lock @@ -1211,7 +1211,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "688625f5bf5283bfdcf572de7101c82242b33e6d" + "reference": "fc0ff1578a9a448a7069fcbe38b5feeee5796676" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1742,7 +1742,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-11-08 10:28:16" + "time": "2016-11-08 12:45:11" }, { "name": "symfony-cmf/routing", From ceffb0afedf5b7b11d51f2cb504c84bf195a8859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Klatt?= Date: Wed, 9 Nov 2016 10:02:59 +0000 Subject: [PATCH 7/9] replaced getMock with getMockBuilder --- composer.json | 2 +- composer.lock | 10 +++++----- .../Assets/Communication/Model/AssetUrlBuilderTest.php | 2 +- .../Yves/Checkout/Process/Steps/AddressStepTest.php | 8 ++++++-- .../Yves/Checkout/Process/Steps/CustomerStepTest.php | 4 ++-- .../Yves/Checkout/Process/Steps/PaymentStepTest.php | 4 ++-- .../Yves/Checkout/Process/Steps/PlaceOrderStepTest.php | 6 +++--- .../Yves/Checkout/Process/Steps/ShipmentStepTest.php | 4 ++-- .../Yves/Checkout/Process/Steps/SuccessStepTest.php | 2 +- .../Yves/Checkout/Process/Steps/SummaryStepTest.php | 4 ++-- 10 files changed, 25 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index 1476c2e1d..a15e80538 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Project", "license": "MIT", "require": { - "spryker/spryker": "dev-master", + "spryker/spryker": "dev-feature/update-php-unit", "php": ">=5.6.0", "braintree/braintree_php": "~3.15.0", diff --git a/composer.lock b/composer.lock index 76735ceac..397bd686a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "765a26854d3304ba6b49bf521dd4ba9f", - "content-hash": "f5540a21f3e427bf19c4f30ef06aad54", + "hash": "3383feddb4058858666dbad3db4ea214", + "content-hash": "1482e0a6a8a573b324c24263262499a9", "packages": [ { "name": "braintree/braintree_php", @@ -1207,11 +1207,11 @@ }, { "name": "spryker/spryker", - "version": "dev-master", + "version": "dev-feature/update-php-unit", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "fc0ff1578a9a448a7069fcbe38b5feeee5796676" + "reference": "1943b5cb34b7f106394c7b0b3bab4b49e02ea617" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1742,7 +1742,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-11-08 12:45:11" + "time": "2016-11-09 10:01:23" }, { "name": "symfony-cmf/routing", diff --git a/tests/YvesUnit/Pyz/Yves/Assets/Communication/Model/AssetUrlBuilderTest.php b/tests/YvesUnit/Pyz/Yves/Assets/Communication/Model/AssetUrlBuilderTest.php index 0d001d0be..134b41ac0 100644 --- a/tests/YvesUnit/Pyz/Yves/Assets/Communication/Model/AssetUrlBuilderTest.php +++ b/tests/YvesUnit/Pyz/Yves/Assets/Communication/Model/AssetUrlBuilderTest.php @@ -71,7 +71,7 @@ public function testMediaUrlWithTrailingSlashes() */ private function getCacheBusterMock() { - $mock = $this->getMock(CacheBusterInterface::class); + $mock = $this->getMockBuilder(CacheBusterInterface::class)->getMock(); $mock->expects($this->any()) ->method('addCacheBust') ->will($this->returnArgument(0)); diff --git a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/AddressStepTest.php b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/AddressStepTest.php index f515e6731..c1a64f560 100644 --- a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/AddressStepTest.php +++ b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/AddressStepTest.php @@ -184,7 +184,11 @@ protected function createAddressStep($customerClientMock = null) $customerClientMock = $this->createCustomerClientMock(); } - $addressStepMock = $this->getMock(AddressStep::class, ['getDataClass'], [$customerClientMock, 'address_step', 'escape_route']); + $addressStepMock = $this->getMockBuilder(AddressStep::class) + ->setMethods(['getDataClass']) + ->setConstructorArgs([$customerClientMock, 'address_step', 'escape_route']) + ->getMock(); + $addressStepMock->method('getDataClass')->willReturn(new QuoteTransfer()); return $addressStepMock; @@ -203,7 +207,7 @@ protected function createRequest() */ protected function createCustomerClientMock() { - return $this->getMock(CustomerClientInterface::class); + return $this->getMockBuilder(CustomerClientInterface::class)->getMock(); } } diff --git a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/CustomerStepTest.php b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/CustomerStepTest.php index 8f4df38c1..4ceb42938 100644 --- a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/CustomerStepTest.php +++ b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/CustomerStepTest.php @@ -139,7 +139,7 @@ protected function createCustomerStep($customerClientMock = null, $authHandlerMo */ protected function createAuthHandlerMock() { - return $this->getMock(StepHandlerPluginInterface::class); + return $this->getMockBuilder(StepHandlerPluginInterface::class)->getMock(); } /** @@ -155,7 +155,7 @@ protected function createRequest() */ protected function createCustomerClientMock() { - return $this->getMock(CustomerClientInterface::class); + return $this->getMockBuilder(CustomerClientInterface::class)->getMock(); } } diff --git a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PaymentStepTest.php b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PaymentStepTest.php index 8bb090c6e..2c8cb47cc 100644 --- a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PaymentStepTest.php +++ b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PaymentStepTest.php @@ -99,7 +99,7 @@ protected function createRequest() */ protected function createPaymentPluginMock() { - return $this->getMock(StepHandlerPluginInterface::class); + return $this->getMockBuilder(StepHandlerPluginInterface::class)->getMock(); } /** @@ -107,7 +107,7 @@ protected function createPaymentPluginMock() */ protected function getFlashMessengerMock() { - return $this->getMock(FlashMessengerInterface::class); + return $this->getMockBuilder(FlashMessengerInterface::class)->getMock(); } } diff --git a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PlaceOrderStepTest.php b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PlaceOrderStepTest.php index 302c339be..622882e8c 100644 --- a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PlaceOrderStepTest.php +++ b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PlaceOrderStepTest.php @@ -152,7 +152,7 @@ protected function createRequest() */ protected function createFlashMessengerMock() { - return $this->getMock(FlashMessengerInterface::class); + return $this->getMockBuilder(FlashMessengerInterface::class)->getMock(); } /** @@ -160,7 +160,7 @@ protected function createFlashMessengerMock() */ protected function createCheckoutClientMock() { - return $this->getMock(CheckoutClientInterface::class); + return $this->getMockBuilder(CheckoutClientInterface::class)->getMock(); } /** @@ -168,7 +168,7 @@ protected function createCheckoutClientMock() */ protected function createShipmentMock() { - return $this->getMock(StepHandlerPluginInterface::class); + return $this->getMockBuilder(StepHandlerPluginInterface::class)->getMock(); } } diff --git a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/ShipmentStepTest.php b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/ShipmentStepTest.php index cfead1d75..f7cf05d41 100644 --- a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/ShipmentStepTest.php +++ b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/ShipmentStepTest.php @@ -102,7 +102,7 @@ protected function createRequest() */ protected function createCalculationClientMock() { - $calculationMock = $this->getMock(CalculationClientInterface::class); + $calculationMock = $this->getMockBuilder(CalculationClientInterface::class)->getMock(); $calculationMock->method('recalculate')->willReturnArgument(0); return $calculationMock; @@ -113,7 +113,7 @@ protected function createCalculationClientMock() */ protected function createShipmentMock() { - return $this->getMock(StepHandlerPluginInterface::class); + return $this->getMockBuilder(StepHandlerPluginInterface::class)->getMock(); } } diff --git a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SuccessStepTest.php b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SuccessStepTest.php index 805cfb1d0..8bd31d2ee 100644 --- a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SuccessStepTest.php +++ b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SuccessStepTest.php @@ -98,7 +98,7 @@ protected function createRequest() */ protected function createCustomerClientMock() { - return $this->getMock(CustomerClientInterface::class); + return $this->getMockBuilder(CustomerClientInterface::class)->getMock(); } } diff --git a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SummaryStepTest.php b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SummaryStepTest.php index 07e5e2878..80aca319c 100644 --- a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SummaryStepTest.php +++ b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SummaryStepTest.php @@ -97,7 +97,7 @@ protected function createRequest() */ protected function createCalculationClientMock() { - return $this->getMock(CalculationClientInterface::class); + return $this->getMockBuilder(CalculationClientInterface::class)->getMock(); } /** @@ -105,7 +105,7 @@ protected function createCalculationClientMock() */ protected function createShipmentMock() { - return $this->getMock(StepHandlerPluginInterface::class); + return $this->getMockBuilder(StepHandlerPluginInterface::class)->getMock(); } } From f2a18ab8164b96c26dd8a1d8d93d212a9638d99f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Klatt?= Date: Wed, 9 Nov 2016 10:47:41 +0000 Subject: [PATCH 8/9] update spryker/spryker --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 397bd686a..d24870907 100644 --- a/composer.lock +++ b/composer.lock @@ -1211,7 +1211,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "1943b5cb34b7f106394c7b0b3bab4b49e02ea617" + "reference": "8de172e19be6d35378110fc5e9b2040f03f84cf6" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1742,7 +1742,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-11-09 10:01:23" + "time": "2016-11-09 10:46:18" }, { "name": "symfony-cmf/routing", From 16868f2160d518bd4eb41e75f6f241c9b3d74122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Klatt?= Date: Wed, 9 Nov 2016 11:23:52 +0000 Subject: [PATCH 9/9] update spryker/spryker --- composer.json | 2 +- composer.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index a15e80538..1476c2e1d 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Project", "license": "MIT", "require": { - "spryker/spryker": "dev-feature/update-php-unit", + "spryker/spryker": "dev-master", "php": ">=5.6.0", "braintree/braintree_php": "~3.15.0", diff --git a/composer.lock b/composer.lock index d24870907..7a6755108 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "3383feddb4058858666dbad3db4ea214", - "content-hash": "1482e0a6a8a573b324c24263262499a9", + "hash": "765a26854d3304ba6b49bf521dd4ba9f", + "content-hash": "f5540a21f3e427bf19c4f30ef06aad54", "packages": [ { "name": "braintree/braintree_php", @@ -1207,11 +1207,11 @@ }, { "name": "spryker/spryker", - "version": "dev-feature/update-php-unit", + "version": "dev-master", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "8de172e19be6d35378110fc5e9b2040f03f84cf6" + "reference": "8669c101de99f5c175a33da5a1cafd21bd1c44bf" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1742,7 +1742,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-11-09 10:46:18" + "time": "2016-11-09 11:13:13" }, { "name": "symfony-cmf/routing",