Remove duplicate sfPropelPlugin phing code (#1902)

Author: melaniekung

apps/qubit/modules/settings/actions/diacriticsAction.class.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the Access to Memory (AtoM) software.
  *

apps/qubit/modules/settings/actions/editAction.class.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the Access to Memory (AtoM) software.
  *

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",

composer.lock

@@ -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']

config/ProjectConfiguration.class.php

@@ -3,12 +3,15 @@
 ; -------------------------------------
 
 ; Internal system tasks
-; 
+;
 adhoc=phing.tasks.system.AdhocTask
 adhoc-task=phing.tasks.system.AdhocTaskdefTask
 adhoc-type=phing.tasks.system.AdhocTypedefTask
+apply=phing.tasks.system.ApplyTask
 append=phing.tasks.system.AppendTask
+attrib=phing.tasks.system.AttribTask
 available=phing.tasks.system.AvailableTask
+blockfor=phing.tasks.system.BlockForTask
 chmod=phing.tasks.system.ChmodTask
 chown=phing.tasks.system.ChownTask
 concat=phing.tasks.system.AppendTask
@@ -17,35 +20,50 @@ copy=phing.tasks.system.CopyTask
 cvs=phing.tasks.system.CvsTask
 cvspass=phing.tasks.system.CvsPassTask
 delete=phing.tasks.system.DeleteTask
+dirname=phing.tasks.system.Dirname
 echo=phing.tasks.system.EchoTask
+echoproperties=phing.tasks.system.EchoProperties
 exec=phing.tasks.system.ExecTask
-fail=phing.tasks.system.ExitTask
+fail=phing.tasks.system.FailTask
 foreach=phing.tasks.system.ForeachTask
 includepath=phing.tasks.system.IncludePathTask
 input=phing.tasks.system.InputTask
 mkdir=phing.tasks.system.MkdirTask
 move=phing.tasks.system.MoveTask
 phing=phing.tasks.system.PhingTask
 phingcall=phing.tasks.system.PhingCallTask
+phingversion=phing.tasks.system.condition.PhingVersion
 php=phing.tasks.system.PhpEvalTask
 property=phing.tasks.system.PropertyTask
 propertyprompt=phing.tasks.system.PropertyPromptTask
+record=phing.tasks.system.RecorderTask
 reflexive=phing.tasks.system.ReflexiveTask
 resolvepath=phing.tasks.system.ResolvePathTask
+retry=phing.tasks.system.Retry
+sleep=phing.tasks.system.SleepTask
 taskdef=phing.tasks.system.TaskdefTask
+tempfile=phing.tasks.system.TempFile
 touch=phing.tasks.system.TouchTask
+truncate=phing.tasks.system.TruncateTask
 tstamp=phing.tasks.system.TstampTask
 typedef=phing.tasks.system.TypedefTask
 uptodate=phing.tasks.system.UpToDateTask
 xslt=phing.tasks.system.XsltTask
 if=phing.tasks.system.IfTask
 warn=phing.tasks.system.WarnTask
+import=phing.tasks.system.ImportTask
+loadfile=phing.tasks.system.LoadFileTask
+switch=phing.tasks.system.SwitchTask
+basename=phing.tasks.system.Basename
+diagnostics=phing.tasks.system.DiagnosticsTask
+pathconvert=phing.tasks.system.PathConvert
 
 ; "Core" contributed tasks
 ; -- i.e. no taskdef needed.
 
 creole=phing.tasks.ext.creole.CreoleSQLExecTask
 pdo=phing.tasks.ext.pdo.PDOSQLExecTask
+pdosqlexec=phing.tasks.ext.pdo.PDOSQLExecTask
 package-as-path=phing.tasks.ext.PackageAsPathTask
 smarty=phing.tasks.ext.SmartyTask
 capsule=phing.tasks.ext.CapsuleTask
@@ -56,31 +74,118 @@ pearpkg2=phing.tasks.ext.PearPackage2Task
 mail=phing.tasks.ext.MailTask
 zip=phing.tasks.ext.ZipTask
 unzip=phing.tasks.ext.UnzipTask
-scpsend=phing.tasks.ext.ScpSendTask
+waitfor=phing.tasks.system.WaitForTask
+trycatch=phing.tasks.system.TryCatchTask
 
 ; "ext" tasks
 phpdoc=phing.tasks.ext.phpdoc.PhpDocumentorTask
 phpdocext=phing.tasks.ext.phpdoc.PhpDocumentorExternalTask
-;svnlastrevision=phing.tasks.ext.svn.SvnLastRevisionTask
-;svncheckout=phing.tasks.ext.svn.SvnCheckoutTask
-;svnexport=phing.tasks.ext.svn.SvnExportTask
-;svnupdate=phing.tasks.ext.svn.SvnUpdateTask
-;phpunit3=phing.tasks.ext.phpunit.PHPUnitTask
-;phpunit3report=phing.tasks.ext.phpunit.PHPUnitReportTask
-;phpunit2=phing.tasks.ext.phpunit.PHPUnitTask
-;phpunit2report=phing.tasks.ext.phpunit.PHPUnitReportTask
-;phpunit=phing.tasks.ext.phpunit.PHPUnitTask
-;phpunitreport=phing.tasks.ext.phpunit.PHPUnitReportTask
-;coverage-setup=phing.tasks.ext.coverage.CoverageSetupTask
-;coverage-merger=phing.tasks.ext.coverage.CoverageMergerTask
-;coverage-report=phing.tasks.ext.coverage.CoverageReportTask
-;ioncubeencoder=phing.tasks.ext.ioncube.IoncubeEncoderTask
-;ioncubelicense=phing.tasks.ext.ioncube.IoncubeLicenseTask
-;simpletest=phing.tasks.ext.simpletest.SimpleTestTask
-;phplint=phing.tasks.ext.PhpLintTask
-;xmllint=phing.tasks.ext.XmlLintTask
-;analyze=phing.tasks.ext.ZendCodeAnalyzerTask
-;jsllint=phing.tasks.ext.JslLintTask
-;manifest=phing.tasks.ext.ManifestTask
-;phpcodesniffer=phing.tasks.ext.PhpCodeSnifferTask
-;ftpdeploy=phing.tasks.ext.FtpDeployTask
+svnlastrevision=phing.tasks.ext.svn.SvnLastRevisionTask
+svncheckout=phing.tasks.ext.svn.SvnCheckoutTask
+svnexport=phing.tasks.ext.svn.SvnExportTask
+svnupdate=phing.tasks.ext.svn.SvnUpdateTask
+svnswitch=phing.tasks.ext.svn.SvnSwitchTask
+svncopy=phing.tasks.ext.svn.SvnCopyTask
+svncommit=phing.tasks.ext.svn.SvnCommitTask
+svnlist=phing.tasks.ext.svn.SvnListTask
+svnlog=phing.tasks.ext.svn.SvnLogTask
+svninfo=phing.tasks.ext.svn.SvnInfoTask
+gitinit=phing.tasks.ext.git.GitInitTask
+gitclone=phing.tasks.ext.git.GitCloneTask
+gitgc=phing.tasks.ext.git.GitGcTask
+gitbranch=phing.tasks.ext.git.GitBranchTask
+gitfetch=phing.tasks.ext.git.GitFetchTask
+gitmerge=phing.tasks.ext.git.GitMergeTask
+gitcheckout=phing.tasks.ext.git.GitCheckoutTask
+gitpull=phing.tasks.ext.git.GitPullTask
+gitpush=phing.tasks.ext.git.GitPushTask
+gitlog=phing.tasks.ext.git.GitLogTask
+gittag=phing.tasks.ext.git.GitTagTask
+gitcommit=phing.tasks.ext.git.GitCommitTask
+gitdescribe=phing.tasks.ext.git.GitDescribeTask
+hgadd=phing.tasks.ext.hg.HgAddTask
+hgarchive=phing.tasks.ext.hg.HgArchiveTask
+hgclone=phing.tasks.ext.hg.HgCloneTask
+hgcommit=phing.tasks.ext.hg.HgCommitTask
+hginit=phing.tasks.ext.hg.HgInitTask
+hglog=phing.tasks.ext.hg.HgLogTask
+hgpull=phing.tasks.ext.hg.HgPullTask
+hgpush=phing.tasks.ext.hg.HgPushTask
+hgrevert=phing.tasks.ext.hg.HgRevertTask
+hgtag=phing.tasks.ext.hg.HgTagTask
+hgupdate=phing.tasks.ext.hg.HgUpdateTask
+phpunit3=phing.tasks.ext.phpunit.PHPUnitTask
+phpunit3report=phing.tasks.ext.phpunit.PHPUnitReportTask
+phpunit=phing.tasks.ext.phpunit.PHPUnitTask
+phpunitreport=phing.tasks.ext.phpunit.PHPUnitReportTask
+coverage-setup=phing.tasks.ext.coverage.CoverageSetupTask
+coverage-merger=phing.tasks.ext.coverage.CoverageMergerTask
+coverage-report=phing.tasks.ext.coverage.CoverageReportTask
+coverage-threshold=phing.tasks.ext.coverage.CoverageThresholdTask
+ioncubeencoder=phing.tasks.ext.ioncube.IoncubeEncoderTask
+ioncubelicense=phing.tasks.ext.ioncube.IoncubeLicenseTask
+simpletest=phing.tasks.ext.simpletest.SimpleTestTask
+phplint=phing.tasks.ext.PhpLintTask
+xmllint=phing.tasks.ext.XmlLintTask
+analyze=phing.tasks.ext.ZendCodeAnalyzerTask
+zendcodeanalyzer=phing.tasks.ext.ZendCodeAnalyzerTask
+jshint=phing.tasks.ext.JsHintTask
+jsllint=phing.tasks.ext.JslLintTask
+manifest=phing.tasks.ext.ManifestTask
+phpcodesniffer=phing.tasks.ext.PhpCodeSnifferTask
+phpcpd=phing.tasks.ext.phpcpd.PHPCPDTask
+phploc=phing.tasks.ext.phploc.PHPLocTask
+phpmd=phing.tasks.ext.phpmd.PHPMDTask
+phpdepend=phing.tasks.ext.pdepend.PhpDependTask
+ftpdeploy=phing.tasks.ext.FtpDeployTask
+phkpackage=phing.tasks.ext.phk.PhkPackageTask
+pharpackage=phing.tasks.ext.phar.PharPackageTask
+scp=phing.tasks.ext.ssh.ScpTask
+; deprecate ScpSendTask
+scpsend=phing.tasks.ext.ssh.ScpTask
+ssh=phing.tasks.ext.ssh.SshTask
+replaceregexp=phing.tasks.ext.ReplaceRegexpTask
+jsmin=phing.tasks.ext.jsmin.JsMinTask
+version=phing.tasks.ext.VersionTask
+filehash=phing.tasks.ext.FileHashTask
+filesize=phing.tasks.ext.FileSizeTask
+filesync=phing.tasks.ext.FileSyncTask
+xmlproperty=phing.tasks.ext.XmlPropertyTask
+exportproperties=phing.tasks.ext.ExportPropertiesTask
+http-request=phing.tasks.ext.HttpRequestTask
+httpget=phing.tasks.ext.HttpGetTask
+patch=phing.tasks.ext.PatchTask
+dbdeploy=phing.tasks.ext.dbdeploy.DbDeployTask
+symlink=phing.tasks.ext.SymlinkTask
+s3get=phing.tasks.ext.Service.Amazon.S3.S3GetTask
+s3put=phing.tasks.ext.Service.Amazon.S3.S3PutTask
+zendguardencode=phing.tasks.ext.zendguard.ZendGuardEncodeTask
+zendguardlicense=phing.tasks.ext.zendguard.ZendGuardLicenseTask
+phpdoc2=phing.tasks.ext.phpdoc.PhpDocumentor2Task
+inifile=phing.tasks.ext.inifile.IniFileTask
+rST=phing.tasks.ext.rSTTask
+sass=phing.tasks.ext.SassTask
+apigen=phing.tasks.ext.apigen.ApiGenTask
+parallel=phing.tasks.ext.ParallelTask
+symfonyconsole=phing.tasks.ext.SymfonyConsole.SymfonyConsoleTask
+composer=phing.tasks.ext.ComposerTask
+autoloader=phing.tasks.ext.AutoloaderTask
+; liquibase
+liquibase-changelog=phing.tasks.ext.liquibase.LiquibaseChangeLogTask
+liquibase-dbdoc=phing.tasks.ext.liquibase.LiquibaseDbDocTask
+liquibase-diff=phing.tasks.ext.liquibase.LiquibaseDiffTask
+liquibase-rollback=phing.tasks.ext.liquibase.LiquibaseRollbackTask
+liquibase-tag=phing.tasks.ext.liquibase.LiquibaseTagTask
+liquibase-update=phing.tasks.ext.liquibase.LiquibaseUpdateTask
+liquibase=phing.tasks.ext.liquibase.LiquibaseTask
+notifysend=phing.tasks.ext.NotifySendTask
+growlnotify=phing.tasks.ext.GrowlNotifyTask
+wikipublish=phing.tasks.ext.WikiPublishTask
+stopwatch=phing.tasks.ext.StopwatchTask
+throw=phing.tasks.ext.ThrowTask
+pathtofileset=phing.tasks.ext.property.PathToFileSet
+propertyregex=phing.tasks.ext.property.RegexTask
+zsdtvalidate=phing.tasks.ext.zendserverdeploymenttool.zsdtValidateTask
+zsdtpack=phing.tasks.ext.zendserverdeploymenttool.zsdtPackTask
+phardata=phing.tasks.ext.phar.PharDataTask
+sonar=phing.tasks.ext.sonar.SonarTask

vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/phing/tasks/defaults.properties

@@ -10,4 +10,7 @@ filterreader=phing.types.PhingFilterReader
 regexp=phing.types.RegularExpression
 param=phing.types.Parameter
 path=phing.types.Path
-selector=phing.types.selectors.SelectSelector
+pearpackagefileset=phing.types.PearPackageFileSet
+selector=phing.types.selectors.SelectSelector
+sshconfig=phing.tasks.ext.ssh.Ssh2MethodParam
+description=phing.types.Description