Test removing phing dup

artefactual · Dec 14, 2024 · ac77e7f · ac77e7f
1 parent b483c08
commit ac77e7f
Show file tree

Hide file tree

Showing 486 changed files with 172 additions and 106,870 deletions.
diff --git a/apps/qubit/modules/settings/actions/diacriticsAction.class.php b/apps/qubit/modules/settings/actions/diacriticsAction.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the Access to Memory (AtoM) software.
  *

diff --git a/apps/qubit/modules/settings/actions/editAction.class.php b/apps/qubit/modules/settings/actions/editAction.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the Access to Memory (AtoM) software.
  *

diff --git a/composer.json b/composer.json
@@ -13,10 +13,10 @@
     "require-dev": {
         "mikey179/vfsstream": "^1.6",
         "phpunit/phpunit": "^9.5",
-        "phing/phing": "2.*",
         "friendsofphp/php-cs-fixer": "^3.0"
     },
     "require": {
+        "phing/phing": "2.*",
         "league/csv": "^9.4",
         "apereo/phpcas": "^1.3.8",
         "ezyang/htmlpurifier": "^4.13",

diff --git a/composer.lock b/composer.lock
diff --git a/config/ProjectConfiguration.class.php b/config/ProjectConfiguration.class.php
@@ -56,6 +56,9 @@ public function setup()
 
         $this->enablePlugins($plugins);
 
+        sfConfig::set('sf_phing_path', sfConfig::get('sf_root_dir').DIRECTORY_SEPARATOR.'vendor/phing/phing');
+        sfConfig::set('sf_propel_path', sfConfig::get('sf_root_dir').DIRECTORY_SEPARATOR.'symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/');
+
         $this->dispatcher->connect(
             'debug.web.load_panels',
             ['arWebDebugPanel', 'listenToLoadDebugWebPanelEvent']

diff --git a/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildEvent.php b/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildEvent.php
diff --git a/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildException.php b/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildException.php
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     <?php
     /*
      * This file is part of the Access to Memory (AtoM) software.
      *
@@ Expand Down @@