Skip to content

Commit

Permalink
Feature/symfony upgrade to.3.4 (#222)
Browse files Browse the repository at this point in the history
* fix install of grunt-cli to only install the 1.3.2 so that it does not brake with older versions of node

* Renew SSL certs until 2026

* Removed symfony/security-csrf package since it was colliding with symfony/security which replaces thr former one. Thanks to that, symfony/security can be safely updated to 2.8.52 .

* Removed enforcement to keep some Symfony package in v2.8.0 so they are now updatable to 2.8.52

* Added (un)zip packages to Dockerfile so we remove Composer warning (#170)

* Bug/fix unit tests (#171)

* Added missing PDO dependency which is in fact needed

* Fixed Sponsor model unit tests

* Removed pointless comments and deprecated method on Mail model

* Fixed Mail model unit tests

* Fixed TextTest translations tests due to missing and/or incorrect HTML tags/attributes

* Updated Matcher model tests

* Enforce PHP 7.1 as minimum PHP version in Composer

* Fixed HTML structure on newsletter template and removed commented CSS classes

* Improved readability, added parameter types and some small refactors on Mail model

* Improved readability and added parameter types on MatcherTest class

* Further cleanup on User and MatcherTest classes

* Downgraded minimum PHP version to the production one

* Reintroduced sqlWhere variable so we don't get errors since it's used in the code

* Fully reintroduced the Sponsor 'type' property and fixed related failing test

* Refactored call to obtain Sponsors list into a method

* Fix SQL query to obtain Sponsors list

* Fix Mail model tests along with issues on the HTML formatting with 2 related templates

* Changed method syntax so is PHP 7.0 compliant (it was using PHP 7.1 syntax)

* Fix Matcher model tests (some translations were missing when querying for them)

* Reduced tests verbosity (we don't need to know if users, projects, etc were removed when running tests)

* Ignored .idea (Jetbrains IDEs) folder

* Bumped PHPMailer to 6.x and fixed Mail model and test with related changes

* Bumped Mockery to 1.x

* Added OpenSSL extension, since it's used by AmazonSns and AuthListener classes

* Updated amazon-s3-php-class with many changes (last updated on 2015)

* Assure PHPMailer minimum version is 6.4

* Updated to PHPUnit 6.5

* Removed empty test along with unused imports

* Moved PHP extensions on composer file right after the PHP version for easy spotting

* Reduced verbosity on tests output so we can focus on seeing if the focus passed, failed, errored or were skipped

* Remove deprecated asserts and upgrade PHPUnit from 6.x to 7.x

* Bumped min PHP version to 7.1

* Upgrade PHP from 7.0/7.1 to 7.4

* Upgraded PHPUnit to 8.x (depends on PR that enforces PHP 7.4)

* Removed deprecated expectedException (will be removed on PHPUnit 9.x). Flipped assertEquals comparators to be compliant with expected/actual order.

* Removed deprecated class

* Got rid of last array curly braces access

* Removed duplicated key

* Removed deprecated (and unused) FlattenException import

* Removed last noisy message on PHPUnit so we only have test results status

* WIP Upgrade to Symfony 3.x

* Tidy index(_env).php files so they have less differences between them, for a future merge

* Got rid of index_dev.php in favor of index.php that read ENV DEBUG parameter

* Added import, rewritten some PHPDocs and added some return types

* Clean container.php

* Refactor getName() method from custom Symfony Form Types, so they just have getBlockPrefix() method

* Refactor to add Form Types as is required in Symfony 3

* Fix install of migrations on PHP 7.4 and latest Composer dependencies

* Fix RouteListener initialization. Fix DB setup.

* Use ::class to register services in the ServiceContainer instead of strings

* Fix composer.json so it reckognizes goteo-private tests

* Fix tests for App class (due to having renamed a property)

* Updated Omnipay dependency to the new one from league

* Grouped Composer dependencies

* Used Symfony HttpKernel class instead of HttpKernel\HttpKernel

* Removed unneeded package

* Cleanup Omnipay classes and fix some issues while initilizing the Payment Gateway

* Made final changes to support all Omnipay payment methods using Omnipay v3

* Deprecated static AbstractPaymentMethod::getId() method in favor of non static one

* Converted static calculateComission method into non-static calculateCommission

* Converted static AbstractPaymentMethod::isInternal() into a non-static method

* Add parameter / return types and import used classes

* Updated TelegramBot so it doesn't use deprecated code

* Reviewed controllers to ensure they follow Symfony 3 convention

* Add User property type

* Removed unused code

* Tidy up classes

* Removed unused parameters from PHPDoc

* Upgraded Symfony from 3.0 to 3.1

* Included some used classes

* Finalize migration to symfony/forms 3.x (there must be a getBlockPrefix() method on a new Type, even if their parents have the method

* Enforce getModelForm() & createFormBuilder() from controllers to return FormProcessorInterface & FormFactory respectively

* Fix return parameter of Controller::createFormBuilder() method and the controllers that inherit it

* Upgraded to Symfony 3.2

* Symfony packages upgraded to 3.3

* WIP Migration to Symfony 3.4 almost completed

* Fix call to Mail::renderEmailTemplate (got renamed recently)

* Fix Settings Dashboard form (ChoiceType elements had flipped key / values)

* Fix loading of ChoiceType and some minor refactors

* Fix ChoiceType for some forms related to Contract PersonDocumentTypes

* Revert BooleanType::getBlockPrefix() method so it returns 'boolean' which to match it's class name

* Refactor ProjectOverviewForm to fix it and to ease its reading

* Fix import of PDOException (it was written incorrectly)

* Fix ChoiceTypes on several Project related forms

* Refactor to use the new Controller:getModelForm() method that requires a class instead of just a string. Fixed some Symfony Forms due to incomplete migration when Symfony 3.0 upgrade.

* Refactored last controller that used the deprecated method to guess SymfonyForm class

* Tiny refactors

* Removed unnecessary EventDispatcher from Console class

* Clean up of some classes

* Change test to testLegacy, since the deprecation notice is due to Symfony code (and is due to expire on Symfony 4.3)

* Fix some Symfony Forms with unfinished migration to Symfony 3.x. Remove some unused code / comments.

* General cleanup of controllers

* Tiny cleanup

* Fix access to some admin pages

* Fix usage of DatepickerType so it actually replaces the Symfony type while keeping all it's parents features

* Fix admin blog add/edit form

* Fix behaviour of some custom Symfony Form Types

* Fix FilterForm so it conforms to Symfony 3.x standards

* Readd workshop_location table since it got removed sometime ago by mistake

* Fix Symfony Console (probably due to some incomplete step after migrating to Symfony 3.x)

* Fix admin workshop add/edit form

* Fix some translations

* Refactor Sponsors controller

* Fix broken CSS on Call edit form for rewards items

* Fix admin Stories add/edit form

* Fix CSS error while displaying TypeaheadType form elements

* Fix Controller::redirect() parameter types

* Fix admin Channel Questionnaire and Channel Section forms to add/edit

* Fix Admin Charts API controller

* Cleanup SessionListener

* Reformatted Filter and Project models

* Simplify public/index.php

* Cleanup main PHP classes

* Minor refactors on controllers

* Removed deprecated mcrypt PHP extension

* Removed deprecated mcrypt PHP extension from composer.lock

* Fix SQL migration

* Fix SQL migration related to mail table

* Fix SQL migration related to mail table

* Fix SQL migration related to mail table

* Improved Docker readme

* Moved Omnipay/Mock/Gateway class to goteo repository (is needed to run PHPUnits successfully)

Co-authored-by: Javier <[email protected]>
Co-authored-by: David Igón <[email protected]>
Co-authored-by: Ivan Vergés <[email protected]>
  • Loading branch information
4 people authored Sep 13, 2021
1 parent 3ed687f commit 1f910f9
Show file tree
Hide file tree
Showing 267 changed files with 9,942 additions and 12,544 deletions.
3 changes: 0 additions & 3 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,5 @@ ServerSignature Off
RewriteEngine On
RewriteBase /dist
RewriteCond %{REQUEST_FILENAME} !-f
# Use this for debugging
# RewriteRule .* index_dev.php?%{QUERY_STRING}
# For production
RewriteRule .* index.php?%{QUERY_STRING}
</IfModule>
8 changes: 4 additions & 4 deletions Resources/translations/ca/workshop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ workshop-register: 'Inscriu-te'
workshop-intro-text: 'Asistiendo a los talleres conocerás cómo las tecnologías digitales revolucionan la relación entre financiadores y proyectos a financiar, potenciando modelos de financiación más transparentes, abiertos y participativos.'
workshop-where-label: 'On estarem?'
workshop-how-label: 'Com arribar?'
workshop-related: 'Conoce otros Fundlabs'
workshop-btn-action: 'Quiero mi Fundlab'
workshop-count-down: 'Queden %s dias!'
workshop-related: 'Coneix altres Fundlabs'
workshop-btn-action: 'Vuic el meu Fundlab'
workshop-count-down: 'Queden %s dies!'
workshop-file-label: 'Programa'
workshop-terms-label: 'Basses'
workshop-share: 'Comparteix!'
Expand All @@ -14,4 +14,4 @@ workshop-type-fundlab: 'Fundlab'
workshop-type-fundlab-esil: 'Fundlab ESIL'
workshop-type-crowdcoop: 'Crowdcoop'
workshsop-partner-promote: 'Promou:'
workshsop-partner-finances: 'Amb el finançament de:'
workshsop-partner-finances: 'Amb el finançament de:'
52 changes: 29 additions & 23 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
"php": "^7.4",
"ext-curl": "*",
"ext-dom": "*",
"ext-fileinfo": "*",
"ext-gd": "*",
"ext-intl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"ext-pdo": "*",
"ext-simplexml": "*",
"ext-xml": "*",
"foil/foil": "~0.6",
"tpyo/amazon-s3-php-class": "dev-master#81a35c61bf76be7c02c95a57771031d21277b1b5",
Expand All @@ -19,26 +22,26 @@
"iignatov/lightopenid": "~1.0",
"paypal/adaptivepayments-sdk-php": "*",
"paypal/merchant-sdk-php": "*",
"symfony/class-loader": "2.8.30",
"symfony/http-foundation": "2.8.30",
"symfony/routing": "2.8.30",
"symfony/http-kernel": "2.8.30",
"symfony/security": "2.8.30",
"symfony/config": "2.8.30",
"symfony/stopwatch": "2.8.30",
"symfony/dependency-injection": "2.8.30",
"symfony/debug": "2.8.30",
"symfony/console": "2.8.30",
"symfony/translation": "2.8.30",
"symfony/finder": "2.8.30",
"symfony/dom-crawler": "2.8.30",
"symfony/css-selector": "2.8.30",
"symfony/process": "2.8.30",
"symfony/form": "2.8.30",
"symfony/templating": "2.8.30",
"symfony/framework-bundle": "2.8.30",
"symfony/validator": "2.8.30",
"symfony/yaml": "^3.3",
"symfony/class-loader": "3.4.*",
"symfony/config": "3.4.*",
"symfony/console": "3.4.*",
"symfony/css-selector": "3.4.*",
"symfony/debug": "3.4.*",
"symfony/dependency-injection": "3.4.*",
"symfony/dom-crawler": "3.4.*",
"symfony/finder": "3.4.*",
"symfony/form": "3.4.*",
"symfony/framework-bundle": "3.4.*",
"symfony/http-foundation": "3.4.*",
"symfony/http-kernel": "3.4.*",
"symfony/routing": "3.4.*",
"symfony/security": "3.4.*",
"symfony/stopwatch": "3.4.*",
"symfony/templating": "3.4.*",
"symfony/translation": "3.4.*",
"symfony/process": "3.4.*",
"symfony/validator": "3.4.*",
"symfony/yaml": "3.4.*",
"monolog/monolog": "^1.17",
"gregwar/captcha": "^1.1",
"geoip2/geoip2": "~2.0",
Expand All @@ -49,9 +52,11 @@
"setasign/fpdf": ">=1.8.1",
"rych/phpass": "3.0.*@beta",
"erusev/parsedown": "^1.6",
"omnipay/omnipay": "~2.0",
"omnipay/paypal": "~2.0",
"league/omnipay": "~3.0",
"league/html-to-markdown": "^4.4",
"omnipay/dummy": "^3.0",
"omnipay/manual": "^3.0",
"omnipay/paypal": "~3.0",
"ua-parser/uap-php": "^3.4",
"kohkimakimoto/lib-migration": "^1.2",
"sensiolabs/ansi-to-html": "^1.1",
Expand All @@ -67,6 +72,7 @@
},
"require-dev": {
"phpunit/phpunit": "^8.0",
"guzzle/plugin-mock": "~3.1"
"guzzle/plugin-mock": "~3.1",
"symfony/phpunit-bridge": "^5.3"
}
}
Loading

0 comments on commit 1f910f9

Please sign in to comment.