Merge pull request #7701 from open-sausages/pulls/4.0/better-summary-…

…merging

 BUG Fix incorrect merge of associative / non-associative summary fields

src/Core/Injector/Injector.php

@@ -426,13 +426,13 @@ public function load($config = array())
             // to ensure we get cached
             $spec['id'] = $id;
 
-//			We've removed this check because new functionality means that the 'class' field doesn't need to refer
-//			specifically to a class anymore - it could be a compound statement, ala SilverStripe's old Object::create
-//			functionality
+//          We've removed this check because new functionality means that the 'class' field doesn't need to refer
+//          specifically to a class anymore - it could be a compound statement, ala SilverStripe's old Object::create
+//          functionality
 //
-//			if (!class_exists($class)) {
-//				throw new Exception("Failed to load '$class' from $file");
-//			}
+//          if (!class_exists($class)) {
+//              throw new Exception("Failed to load '$class' from $file");
+//          }
 
             // store the specs for now - we lazy load on demand later on.
             $this->specs[$id] = $spec;

src/Dev/BulkLoader.php

@@ -136,11 +136,11 @@ public function __construct($objectClass)
     }
 
     /*
-	 * Load the given file via {@link self::processAll()} and {@link self::processRecord()}.
-	 * Optionally truncates (clear) the table before it imports.
-	 *
-	 * @return BulkLoader_Result See {@link self::processAll()}
-	 */
+     * Load the given file via {@link self::processAll()} and {@link self::processRecord()}.
+     * Optionally truncates (clear) the table before it imports.
+     *
+     * @return BulkLoader_Result See {@link self::processAll()}
+     */
     public function load($filepath)
     {
         Environment::increaseTimeLimitTo(3600);

src/Dev/DevelopmentAdmin.php

@@ -140,8 +140,8 @@ public function runRegisteredController(HTTPRequest $request)
 
 
     /*
-	 * Internal methods
-	 */
+     * Internal methods
+     */
 
     /**
      * @return array of url => description
@@ -175,8 +175,8 @@ protected function getRegisteredController($baseUrlPart)
 
 
     /*
-	 * Unregistered (hidden) actions
-	 */
+     * Unregistered (hidden) actions
+     */
 
     /**
      * Build the default data, calling requireDefaultRecords on all

src/Forms/FieldList.php

@@ -688,7 +688,7 @@ public function changeFieldOrder($fieldNames)
             $fieldMap[$field->getName()] = $field;
         }
 
-        // Iterate through the ordered list	of names, building a new array to be put into $this->items.
+        // Iterate through the ordered list of names, building a new array to be put into $this->items.
         // While we're doing this, empty out $fieldMap so that we can keep track of leftovers.
         // Unrecognised field names are okay; just ignore them
         $fields = array();

src/ORM/Connect/DBSchemaManager.php

@@ -890,13 +890,13 @@ abstract public function enumValuesForField($tableName, $fieldName);
 
 
     /*
-	 * This is a lookup table for data types.
-	 * For instance, Postgres uses 'INT', while MySQL uses 'UNSIGNED'
-	 * So this is a DB-specific list of equivilents.
-	 *
-	 * @param string $type
-	 * @return string
-	 */
+     * This is a lookup table for data types.
+     * For instance, Postgres uses 'INT', while MySQL uses 'UNSIGNED'
+     * So this is a DB-specific list of equivilents.
+     *
+     * @param string $type
+     * @return string
+     */
     abstract public function dbDataType($type);
 
     /**
@@ -1151,10 +1151,10 @@ abstract public function time($values);
     abstract public function varchar($values);
 
     /*
-	 * Returns data type for 'year' column
-	 *
-	 * @param array $values Contains a tokenised list of info about this data type
-	 * @return string
-	 */
+     * Returns data type for 'year' column
+     *
+     * @param array $values Contains a tokenised list of info about this data type
+     * @return string
+     */
     abstract public function year($values);
 }

src/ORM/Connect/Database.php

@@ -617,14 +617,14 @@ public function withTransaction(
     }
 
     /*
-	 * Determines if the current database connection supports a given list of extensions
-	 *
-	 * @param array $extensions List of extensions to check for support of. The key of this array
-	 * will be an extension name, and the value the configuration for that extension. This
-	 * could be one of partitions, tablespaces, or clustering
-	 * @return boolean Flag indicating support for all of the above
-	 * @todo Write test cases
-	 */
+     * Determines if the current database connection supports a given list of extensions
+     *
+     * @param array $extensions List of extensions to check for support of. The key of this array
+     * will be an extension name, and the value the configuration for that extension. This
+     * could be one of partitions, tablespaces, or clustering
+     * @return boolean Flag indicating support for all of the above
+     * @todo Write test cases
+     */
     public function supportsExtensions($extensions)
     {
         return false;

src/ORM/Connect/MySQLSchemaManager.php

@@ -614,11 +614,11 @@ public function varchar($values)
     }
 
     /*
-	 * Return the MySQL-proprietary 'Year' datatype
-	 *
-	 * @param array $values Contains a tokenised list of info about this data type
-	 * @return string
-	 */
+     * Return the MySQL-proprietary 'Year' datatype
+     *
+     * @param array $values Contains a tokenised list of info about this data type
+     * @return string
+     */
     public function year($values)
     {
         return 'year(4)';

src/ORM/DataObject.php

@@ -3337,12 +3337,15 @@ public function fieldLabel($name)
      */
     public function summaryFields()
     {
-        $fields = $this->config()->get('summary_fields');
+        $rawFields = $this->config()->get('summary_fields');
 
-        // if fields were passed in numeric array,
-        // convert to an associative array
-        if ($fields && array_key_exists(0, $fields)) {
-            $fields = array_combine(array_values($fields), array_values($fields));
+        // Merge associative / numeric keys
+        $fields = [];
+        foreach ($rawFields as $key => $value) {
+            if (is_int($key)) {
+                $key = $value;
+            }
+            $fields[$key] = $value;
         }
 
         if (!$fields) {
@@ -3418,8 +3421,8 @@ public function isInDB()
     }
 
     /*
-	 * @ignore
-	 */
+     * @ignore
+     */
     private static $subclass_access = true;
 
     /**

tests/behat/src/CmsFormsContext.php

@@ -241,11 +241,11 @@ public function iClickOnTheHtmlFieldButton($button)
     }
 
     /*
-	 * @example Given the CMS settings has the following data
-	 *	| Title | My site title |
-	 *	| Theme | My site theme |
-	 * @Given /^the CMS settings have the following data$/
-	 */
+     * @example Given the CMS settings has the following data
+     *  | Title | My site title |
+     *  | Theme | My site theme |
+     * @Given /^the CMS settings have the following data$/
+     */
     public function theCmsSettingsHasData(TableNode $fieldsTable)
     {
         $fields = $fieldsTable->getRowsHash();

tests/php/Control/ControllerTest.php

@@ -390,8 +390,8 @@ public function testHasAction()
             'Numeric actions do not slip through.'
         );
         //$this->assertFalse(
-        //	$controller->hasAction('lowercase_permission'),
-        //	'Lowercase permission does not slip through.'
+        //  $controller->hasAction('lowercase_permission'),
+        //  'Lowercase permission does not slip through.'
         //);
         $this->assertFalse(
             $controller->hasAction('undefined'),

tests/php/Dev/CsvBulkLoaderTest.php

@@ -230,7 +230,7 @@ public function testLoadWithIdentifiers()
 
         // null values are valid imported
         // $this->assertEquals($player->Biography, 'He\'s a good guy',
-        //	'Test retaining of previous information on duplicate when overwriting with blank field');
+        //  'Test retaining of previous information on duplicate when overwriting with blank field');
     }
 
     public function testLoadWithCustomImportMethods()

tests/php/Forms/ListboxFieldTest.php

@@ -226,11 +226,11 @@ public function testValidationWithDataList()
          * @todo re-enable these tests when field validation is removed from {@link ListboxField::setValue()} and moved
          * to the {@link ListboxField::validate()} function
          */
-        //		$field->setValue(4);
-        //		$this->assertFalse(
-        //			$field->validate($validator),
-        //			'Field does not validate values outside of source map'
-        //		);
+        //      $field->setValue(4);
+        //      $this->assertFalse(
+        //          $field->validate($validator),
+        //          'Field does not validate values outside of source map'
+        //      );
         $field->setValue(
             false,
             new ArrayData(