Merge pull request #1629 from magento-engcom/develop-prs

Oleksii Korshenko · web-flow · commit 4e5f937e764f · 2017-10-26T21:15:30.000-05:00
Public Pull Requests #11771 Removed duplicated rows from the integration PHPUnit config by @rogyar #11760 [TASK] Incorrect minimum memory_limit references have been updated fr… by @lewisvoncken #11727 Fix: field labels wrapping poorly by @enriquei4 Fixed Public Issues #11322 User.ini files specify 768M - Docs recommend at least 1G
diff --git a/.htaccess b/.htaccess
@@ -36,7 +36,7 @@
 ############################################
 ## adjust memory limit
 
-    php_value memory_limit 768M
+    php_value memory_limit 756M
     php_value max_execution_time 18000
 
 ############################################
@@ -59,7 +59,7 @@
 ############################################
 ## adjust memory limit
 
-    php_value memory_limit 768M
+    php_value memory_limit 756M
     php_value max_execution_time 18000
 
 ############################################
diff --git a/.htaccess.sample b/.htaccess.sample
@@ -35,7 +35,7 @@
 ############################################
 ## adjust memory limit
 
-    php_value memory_limit 768M
+    php_value memory_limit 756M
     php_value max_execution_time 18000
 
 ############################################
diff --git a/.user.ini b/.user.ini
@@ -1,4 +1,4 @@
-memory_limit = 768M
+memory_limit = 756M
 max_execution_time = 18000
 session.auto_start = off
 suhosin.session.cryptua = off
diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
@@ -136,8 +136,8 @@ private function updateMemoryLimit()
         if (function_exists('ini_set')) {
             @ini_set('display_errors', 1);
             $memoryLimit = trim(ini_get('memory_limit'));
-            if ($memoryLimit != -1 && $this->getMemoryInBytes($memoryLimit) < 768 * 1024 * 1024) {
-                @ini_set('memory_limit', '768M');
+            if ($memoryLimit != -1 && $this->getMemoryInBytes($memoryLimit) < 756 * 1024 * 1024) {
+                @ini_set('memory_limit', '756M');
             }
         }
     }
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -1383,7 +1383,6 @@
             line-height: 1.33;
             vertical-align: middle;
             white-space: normal;
-            word-break: break-all;
 
             &[data-config-scope] {
                 position: relative;
diff --git a/dev/tests/integration/phpunit.xml.dist b/dev/tests/integration/phpunit.xml.dist
@@ -54,8 +54,6 @@
         <!-- Memory usage and estimated leaks thresholds -->
         <!--<const name="TESTS_MEM_USAGE_LIMIT" value="1024M"/>-->
         <const name="TESTS_MEM_LEAK_LIMIT" value=""/>
-        <!-- Whether to output all CLI commands executed by the bootstrap and tests -->
-        <!--<const name="TESTS_EXTRA_VERBOSE_LOG" value="1"/>-->
         <!-- Path to Percona Toolkit bin directory -->
         <!--<const name="PERCONA_TOOLKIT_BIN_DIR" value=""/>-->
         <!-- CSV Profiler Output file -->
diff --git a/nginx.conf.sample b/nginx.conf.sample
@@ -41,7 +41,7 @@ location ~* ^/setup($|/) {
         fastcgi_pass   fastcgi_backend;
 
         fastcgi_param  PHP_FLAG  "session.auto_start=off \n suhosin.session.cryptua=off";
-        fastcgi_param  PHP_VALUE "memory_limit=768M \n max_execution_time=600";
+        fastcgi_param  PHP_VALUE "memory_limit=756M \n max_execution_time=600";
         fastcgi_read_timeout 600s;
         fastcgi_connect_timeout 600s;
 
@@ -168,7 +168,7 @@ location ~ (index|get|static|report|404|503)\.php$ {
     fastcgi_buffers 1024 4k;
 
     fastcgi_param  PHP_FLAG  "session.auto_start=off \n suhosin.session.cryptua=off";
-    fastcgi_param  PHP_VALUE "memory_limit=768M \n max_execution_time=18000";
+    fastcgi_param  PHP_VALUE "memory_limit=756M \n max_execution_time=18000";
     fastcgi_read_timeout 600s;
     fastcgi_connect_timeout 600s;
 
diff --git a/pub/.htaccess b/pub/.htaccess
@@ -37,7 +37,7 @@
 ############################################
 ## Adjust memory limit
 
-    php_value memory_limit 768M
+    php_value memory_limit 756M
     php_value max_execution_time 18000
 
 ############################################
@@ -60,7 +60,7 @@
 ############################################
 ## Adjust memory limit
 
-    php_value memory_limit 768M
+    php_value memory_limit 756M
     php_value max_execution_time 18000
 
 ############################################
diff --git a/pub/.user.ini b/pub/.user.ini
@@ -1,4 +1,4 @@
-memory_limit = 768M
+memory_limit = 756M
 max_execution_time = 18000
 session.auto_start = off
 suhosin.session.cryptua = off

Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,8 @@ private function updateMemoryLimit()`
`136`	`136`	`if (function_exists('ini_set')) {`
`137`	`137`	`@ini_set('display_errors', 1);`
`138`	`138`	`$memoryLimit = trim(ini_get('memory_limit'));`
`139`		`- if ($memoryLimit != -1 && $this->getMemoryInBytes($memoryLimit) < 768 * 1024 * 1024) {`
`140`		`- @ini_set('memory_limit', '768M');`
	`139`	`+ if ($memoryLimit != -1 && $this->getMemoryInBytes($memoryLimit) < 756 * 1024 * 1024) {`
	`140`	`+ @ini_set('memory_limit', '756M');`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`	`}`