Skip to content

DO NOT MERGE - REFERENCE - branch:omg-8.3 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
permanuno wants to merge 16 commits into
base: master
Choose a base branch
from
Draft

DO NOT MERGE - REFERENCE - branch:omg-8.3 #1

permanuno wants to merge 16 commits into from

Conversation

@permanuno
Copy link
Member

@permanuno permanuno commented Aug 10, 2024 •
edited
Loading

How this was created:

git checkout omg-7.4
git checkout -b omg-8.3
git merge origin/master

Conflict resolution

  • accept all Doctrine file in ours/yours
  • accept all non-conflicting changes in theirs
  • manually reconcile remaining changes

Diff should be functionally equivalent to FriendsOfSymfony1/symfony1@v1.5.19...MDrollette:symfony1:omg-7.4

MDrollette and others added 16 commits April 15, 2020 11:58
@MDrollette
remove sfDoctrinePlugin
365d4c5
@MDrollette
don't cache json responses
65a82a2
@MDrollette
don't set cli for built-in web server
8ccc85f
@MDrollette
don't log 404 exceptions to php error log
167cf33
@MDrollette
always show groups on radio widget if choices is an array
17bc98a
@MDrollette
support sameSite on response->setCookie()
646729e
@permanuno
Merge remote-tracking branch 'origin/master' into omg-8.3
188ce30 
Conflicts:
	.gitmodules
	lib/action/sfAction.class.php
	lib/config/sfApplicationConfiguration.class.php
	lib/exception/sfError404Exception.class.php
	lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormBaseTemplate.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormGeneratedInheritanceTemplate.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormGeneratedTemplate.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormPluginTemplate.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormTemplate.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrinePluginFormTemplate.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterBaseTemplate.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedInheritanceTemplate.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedTemplate.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterPluginTemplate.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterTemplate.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrinePluginFormFilterTemplate.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/configuration.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/actions/actions.class.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/lib/configuration.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/lib/helper.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/template/actions/actions.class.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/template/lib/helper.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/default/skeleton/actions/actions.class.php
	lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/default/template/actions/actions.class.php
	lib/plugins/sfDoctrinePlugin/lib/cli/sfDoctrineCli.class.php
	lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php
	lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
	lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
	lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php
	lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php
	lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php
	lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php
	lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
	lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
	lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineGenerator.class.php
	lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php
	lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php
	lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecord.class.php
	lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php
	lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRoute.class.php
	lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRouteCollection.class.php
	lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCreateModelTablesTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php
	lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
	lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php
	lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php
	lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine
	lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php
	lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php
	lib/plugins/sfDoctrinePlugin/test/bin/coverage.php
	lib/plugins/sfDoctrinePlugin/test/bin/prove.php
	lib/plugins/sfDoctrinePlugin/test/bootstrap/functional.php
	lib/plugins/sfDoctrinePlugin/test/bootstrap/unit.php
	lib/plugins/sfDoctrinePlugin/test/functional/ActionRedirectTest.php
	lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/AdminGenTest.php
	lib/plugins/sfDoctrinePlugin/test/functional/EnvironmentSetupTest.php
	lib/plugins/sfDoctrinePlugin/test/functional/FormGeneratorTest.php
	lib/plugins/sfDoctrinePlugin/test/functional/FormTest.php
	lib/plugins/sfDoctrinePlugin/test/functional/I18nTest.php
	lib/plugins/sfDoctrinePlugin/test/functional/PagerTest.php
	lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php
	lib/plugins/sfDoctrinePlugin/test/functional/SchemaMergeTest.php
	lib/plugins/sfDoctrinePlugin/test/functional/Ticket/5269Test.php
	lib/plugins/sfDoctrinePlugin/test/functional/Ticket/7774Test.php
	lib/plugins/sfDoctrinePlugin/test/functional/UniqueTest.php
	lib/plugins/sfDoctrinePlugin/test/functional/UploadTest.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/config/backendConfiguration.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/doctrine_route_test/actions/actions.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/doctrine_route_test/templates/indexSuccess.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/actions/actions.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorConfiguration.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorHelper.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/templates/layout.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/actions/actions.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/editSuccess.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/indexSuccess.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/showSuccess.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/actions/actions.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/templates/editableInput.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/templates/indexInput.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/templates/layout.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/config/ProjectConfiguration.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleTranslationFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AttachmentFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceConcreteFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BaseFormFilterDoctrine.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleTranslationFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogAuthorFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/CamelCaseFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/DefaultValueTestFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/FormGeneratorTest2FormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/GroupFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/PermissionFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ProfileFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ResourceTypeFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SettingsPlugin/SettingFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SubscriptionFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UniqueTestFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UserFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/BaseForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleTranslationForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AttachmentForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceConcreteForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BaseFormDoctrine.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleTranslationForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogAuthorForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/CamelCaseForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/DefaultValueTestForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/FormGeneratorTestForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/GroupForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/PermissionForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ProfileForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ResourceTypeForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SettingsPlugin/SettingForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SubscriptionForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UniqueTestForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UserForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Article.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ArticleTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Attachment.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Author.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritance.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceConcrete.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceConcreteTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogArticle.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogAuthor.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/CamelCase.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/CamelCaseTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/DefaultValueTest.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/DefaultValueTestTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest2.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest2Table.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest3.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTestTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Group.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupPermission.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupPermissionTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelFromLinkedSchema.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelWithNumberInColumn.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Permission.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/PermissionTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Profile.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ProfileTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ResourceType.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SettingsPlugin/Setting.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SettingsPlugin/SettingTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Subscription.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SubscriptionTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UniqueTest.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UniqueTestTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/User.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserGroup.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserGroupTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserPermission.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserPermissionTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/myDoctrineRecord.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/filter/doctrine/PluginSettingFormFilter.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/form/doctrine/PluginSettingForm.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/model/doctrine/PluginSetting.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/model/doctrine/PluginSettingTable.class.php
	lib/plugins/sfDoctrinePlugin/test/functional/sfDoctrineRecordTest.php
	lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormDoctrineTest.php
	lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormFilterDoctrineTest.php
	lib/plugins/sfDoctrinePlugin/test/unit/pager/sfDoctrinePagerTest.php
	lib/plugins/sfDoctrinePlugin/test/unit/record/sfDoctrineRecordTest.php
	lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineColumnTest.php
	lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php
	lib/plugins/sfDoctrinePlugin/test/unit/validator/sfValidatorDoctrineChoiceTest.php
	lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineArrayChoiceTest.php
	lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineChoiceTest.php
	lib/response/sfWebResponse.class.php
	lib/widget/sfWidgetFormSelectRadio.class.php
@permanuno
Update name in composer.json
141c80d
@permanuno
use composer.json from MDrollete/symfony1:omg-7.4
ad2ded5
@permanuno
revert composer.json changes
7b4970d
@permanuno
try replace self.version
d276b60
@permanuno
remove extra
72e8e8f
@permanuno
change name
14c7a00
@permanuno
revert changes to composer.json
7992cf4
@permanuno
Merge remote-tracking branch 'origin/master' into omg-8.3
61fd5ab
@permanuno
fix fatal error from mixing unsupported types
2e7a2b8 
PHP Fatal error:  Uncaught TypeError: Unsupported operand types: string - int in lexpress/symfony1/lib/command/sfFormatter.class.php:75
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@permanuno @MDrollette