Merge branches 'MAGETWO-60020-config-translation' and 'MAGETWO-60270-static-test' into sprint6-pr (13c83d96) · Commits · KIII-12 / Magento

Commit 13c83d96 authored 8 years ago by

Igor Melnikov

Browse files

Merge branches 'MAGETWO-60020-config-translation' and 'MAGETWO-60270-static-test' into sprint6-pr

parents 13db0b11 9cc32043 43426e1a

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Text.php 46 additions, 24 deletions

...agento/Backend/Block/Widget/Grid/Column/Renderer/Text.php
app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml 2 additions, 0 deletions

...o/Backend/view/adminhtml/layout/adminhtml_cache_block.xml
app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml 2 additions, 0 deletions

...dexer/view/adminhtml/layout/indexer_indexer_list_grid.xml
dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/Column/Renderer/TextTest.php 142 additions, 0 deletions

...to/Backend/Block/Widget/Grid/Column/Renderer/TextTest.php
dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php 5 additions, 21 deletions

.../framework/Magento/TestFramework/Utility/ChangedFiles.php
dev/tests/static/framework/Magento/TestFramework/Utility/File.php 101 additions, 0 deletions

...s/static/framework/Magento/TestFramework/Utility/File.php
dev/tests/static/framework/Magento/TestFramework/Utility/File/RegexIteratorFactory.php 26 additions, 0 deletions

...gento/TestFramework/Utility/File/RegexIteratorFactory.php
dev/tests/static/framework/Magento/TestFramework/Utility/FunctionDetector.php 67 additions, 0 deletions

...mework/Magento/TestFramework/Utility/FunctionDetector.php
dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/FileTest.php 164 additions, 0 deletions

...unit/testsuite/Magento/TestFramework/Utility/FileTest.php
dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/FunctionDetectorTest.php 22 additions, 0 deletions

...te/Magento/TestFramework/Utility/FunctionDetectorTest.php
dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/test.txt 46 additions, 0 deletions

...t/testsuite/Magento/TestFramework/Utility/_files/test.txt
dev/tests/static/testsuite/Magento/Test/Legacy/RestrictedCodeTest.php 34 additions, 10 deletions

...atic/testsuite/Magento/Test/Legacy/RestrictedCodeTest.php
dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php 126 additions, 68 deletions

...tsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
dev/tests/static/testsuite/Magento/Test/Legacy/_files/restricted_classes.php 83 additions, 7 deletions

...stsuite/Magento/Test/Legacy/_files/restricted_classes.php
dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/blacklist.php 0 additions, 10 deletions

...stsuite/Magento/Test/Legacy/_files/security/blacklist.php
dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php 52 additions, 0 deletions

...to/Test/Legacy/_files/security/unsecure_php_functions.php
lib/internal/Magento/Framework/Indexer/Config/Converter.php 3 additions, 2 deletions

lib/internal/Magento/Framework/Indexer/Config/Converter.php

with 921 additions and 142 deletions

Please register or to comment

Admin message

Merge branches 'MAGETWO-60020-config-translation' and 'MAGETWO-60270-static-test' into sprint6-pr