AllCoreTables.data.php - Don't pass through PHP_Beautifier. Update layout.

diff --git a/CRM/Core/CodeGen/Reflection.php b/CRM/Core/CodeGen/Reflection.php
index ab713e2cf7c03975e779c641f64a6c3ac0ae9fc1..515c5b8928d090a886a275abdcb1ee4d781d334f 100644 (file)
--- a/CRM/Core/CodeGen/Reflection.php
+++ b/CRM/Core/CodeGen/Reflection.php
@@ -20,7 +20,7 @@ class CRM_Core_CodeGen_Reflection extends CRM_Core_CodeGen_BaseTask {
    */
   public function run() {
     echo "Generating table list\n";
-    $template = new CRM_Core_CodeGen_Util_Template('php');
+    $template = new CRM_Core_CodeGen_Util_Template('php', ['beautifier' => FALSE]);
     $template->assign('tables', $this->tables);
     $template->assign('genCodeChecksum', 'IGNORE');
     $template->run('listAll.tpl', $this->getAbsFileName());

diff --git a/CRM/Core/DAO/AllCoreTables.data.php b/CRM/Core/DAO/AllCoreTables.data.php
index aa195e1f3d8293dbf514e30e423bc9ba18250331..865e2aeec34c8194069b21f5e69afe8534689ebe 100644 (file)
--- a/CRM/Core/DAO/AllCoreTables.data.php
+++ b/CRM/Core/DAO/AllCoreTables.data.php
@@ -1,30 +1,33 @@
 <?php
+
 /*
-+--------------------------------------------------------------------+
-| CiviCRM version 4.7                                                |
-+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2018                                |
-+--------------------------------------------------------------------+
-| This file is a part of CiviCRM.                                    |
-|                                                                    |
-| CiviCRM is free software; you can copy, modify, and distribute it  |
-| under the terms of the GNU Affero General Public License           |
-| Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
-|                                                                    |
-| CiviCRM is distributed in the hope that it will be useful, but     |
-| WITHOUT ANY WARRANTY; without even the implied warranty of         |
-| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
-| See the GNU Affero General Public License for more details.        |
-|                                                                    |
-| You should have received a copy of the GNU Affero General Public   |
-| License and the CiviCRM Licensing Exception along                  |
-| with this program; if not, contact CiviCRM LLC                     |
-| at info[AT]civicrm[DOT]org. If you have questions about the        |
-| GNU Affero General Public License or the licensing of CiviCRM,     |
-| see the CiviCRM license FAQ at http://civicrm.org/licensing        |
-+--------------------------------------------------------------------+
-*/
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.7                                                |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+ */
+
 // (GenCodeChecksum:IGNORE)
+
 return [
   'CRM_Core_DAO_AddressFormat' => [
     'name' => 'AddressFormat',
@@ -786,4 +789,4 @@ return [
     'class' => 'CRM_Price_DAO_LineItem',
     'table' => 'civicrm_line_item',
   ],
-];
+];
\ No newline at end of file

diff --git a/xml/templates/listAll.tpl b/xml/templates/listAll.tpl
index 32d6313ec298a47efe0e0fe2ba6969431832afed..729efdea1a77953336a7011c85209bf4e5029a76 100644 (file)
--- a/xml/templates/listAll.tpl
+++ b/xml/templates/listAll.tpl
@@ -24,7 +24,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 // (GenCodeChecksum:{$genCodeChecksum})