Switch to CloudRun (experimental)

.circleci/config.yml

@@ -13,9 +13,9 @@ jobs:
           php --version
           node --version
       - run: sudo apt-get update
-      # dependency needed for gd exentions
-      - run: sudo apt-get -y --no-install-recommends install libfontconfig1 libxrender1 libxext6 zlib1g-dev libpng-dev libfreetype6-dev libjpeg8-dev
-      - run: sudo apt-get clean && sudo rm -rf /var/lib/apt/lists/*
+      # # dependency needed for gd exentions
+      # - run: sudo apt-get -y --no-install-recommends install libfontconfig1 libxrender1 libxext6 zlib1g-dev libpng-dev libfreetype6-dev libjpeg8-dev
+      # - run: sudo apt-get clean && sudo rm -rf /var/lib/apt/lists/*
       # load composer cache
       - restore_cache:
           keys:
@@ -26,7 +26,7 @@ jobs:
       # these rules match the ones enabled by default by the "fterrag.vscode-php-cs-fixer" vs code extension
       - run: php vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix . --dry-run --verbose --rules @PhpCsFixer
       # build static assets including templates
-      - run: php build.php
+      - run: php build/build.php
       # install again, but with no dev dependencies this time (for deploy)
       - run: composer install -n --optimize-autoloader --no-dev
       # save composer cache
@@ -118,7 +118,11 @@ jobs:
           # deploy
           gcloud app deploy app-<< parameters.serviceName >>.yaml --version ${CIRCLE_BUILD_NUM}
           gcloud app deploy cron.yaml dispatch.yaml --version ${CIRCLE_BUILD_NUM}
-
+      - run: |
+          # deploy to google run too
+          gcloud run deploy dropapp-test --source . --project ${GOOGLE_PROJECT_ID} \
+            --add-cloudsql-instances=${<< parameters.envVariablePrefix >>DBNAME} \
+            --set-env-vars GOOGLE_CLOUD_PROJECT=${GOOGLE_PROJECT_ID}
   create-sentry-release:
     docker: 
       - image: circleci/node:4.8.2

.gcloudignore

@@ -18,5 +18,4 @@
 # other folders to ignore
 .docker
 phinx.yml
-docker-compose.yml
-build.php
+docker-compose.yml

.php_cs.cache

@@ -0,0 +1 @@
+{"php":"8.1.13","version":"2.19.3:v2.19.3#75ac86f33fab4714ea5a39a396784d83ae3b5ed8","indent":"    ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true},"hashes":{"index.php":1611584145,"build.php":439301503,"ajax.php":1987824403,"include\/cms_users_edit.php":2755343810,"include\/cms_users_page.php":3078103320,"include\/sizes_edit.php":170682164,"include\/organisations.php":3934082260,"include\/libraryhistory.php":1115001705,"include\/stock_confirm.php":3002484522,"include\/check_out.php":1950877715,"include\/sales_list.php":2733456010,"include\/people_photo.php":3561522056,"include\/cms_functions_edit.php":1905688730,"include\/library_inventory_edit.php":1158203485,"include\/cms_translate_edit.php":941929943,"include\/printed_list_people.php":2556093094,"include\/cms_settings.php":1845188784,"include\/give.php":1202454933,"include\/products_edit.php":489722707,"include\/laundry_edit.php":1526480367,"include\/price_list.php":3933634000,"include\/cms_users_expired.php":3109653694,"include\/stock.php":3139889724,"include\/cms_profile.php":298245782,"include\/stock_export.php":1835072079,"include\/cms_users_handle_ajax_operations.php":774907569,"include\/people_deactivated.php":2113187845,"include\/downloads.php":1806725093,"include\/library_edit.php":445399565,"include\/locations.php":772921431,"include\/printed_list_people_oud.php":2459662822,"include\/library.php":3146962240,"include\/laundry_startcycle.php":132863026,"include\/people_add.php":2586654119,"include\/stock_overview_edit.php":1851679153,"include\/cms_usergroups_edit.php":1818468700,"include\/stock_edit.php":3278734051,"include\/products_export.php":2519404595,"include\/stock_overview.php":4141478567,"include\/container-stock.php":3030560346,"include\/library_inventory.php":1716312904,"include\/camps.php":4082644224,"include\/food_lists.php":1217819232,"include\/people_export.php":2061071514,"include\/give2all.php":167200387,"include\/laundry.php":3863210290,"include\/borrowhistory.php":1532248849,"include\/borrow_edit.php":2719878525,"include\/borrowedititem.php":952120968,"include\/tags.php":690874664,"include\/camps_edit.php":61799215,"include\/exitloginas.php":815804432,"include\/cms_users.php":3480411683,"include\/cms_translate.php":3722628573,"include\/cms_usergroups.php":1060637257,"include\/qr.php":2708439878,"include\/sales_list_export.php":2903249363,"include\/products.php":3338420872,"include\/laundry_noshow.php":745769824,"include\/cms_users_deactivated.php":2505460992,"include\/people_edit.php":1312497615,"include\/borrow.php":499090557,"include\/fancygraphs.php":1125760468,"include\/container-stock_edit.php":957123978,"include\/cms_settings_edit.php":4061289289,"include\/cms_functions.php":4100992113,"include\/sizes.php":3437541381,"include\/market_schedule.php":4118315106,"include\/vegetables.php":1596258334,"include\/locations_edit.php":3026611369,"include\/start.php":1605979129,"include\/people.php":1525694029,"include\/tags_edit.php":399545395,"include\/organisations_edit.php":4110974834,"cypress-session.php":3052792521,"pdf\/pdf-card.php":251557684,"pdf\/idcard.php":2213244639,"pdf\/dryfood.php":1840844934,"pdf\/workshopcard.php":2047132421,"pdf\/occcard.php":1250882095,"pdf\/bicyclecard.php":4103771083,"pdf\/qr.php":2564656864,"pdf\/pdf.php":3255717410,"pdf\/fpdf.php":3999799076,"pdf\/fonts\/OpenSans-Regular.php":1387100355,"pdf\/fonts\/helveticab.php":3617740641,"pdf\/fonts\/OpenSans-BoldItalic.php":2762582721,"pdf\/fonts\/helveticabi.php":1962237037,"pdf\/fonts\/OpenSans-Bold.php":3090472604,"pdf\/fonts\/OpenSans-Italic.php":1669898433,"pdf\/fonts\/helvetica.php":315091496,"pdf\/fonts\/helveticai.php":842627836,"library\/functions.php":1373244479,"library\/gcloud.php":896639199,"library\/config.php":1805532447,"library\/error-reporting.php":2298939625,"library\/constants.php":3513075857,"library\/lib\/loginNotifications.php":3000739621,"library\/lib\/errorhandling.php":3227035067,"library\/lib\/mail.php":3017035794,"library\/lib\/database.php":2213674239,"library\/lib\/session.php":2501077448,"library\/lib\/translate.php":1775557144,"library\/lib\/tools.php":1196929853,"library\/lib\/csvexport.php":2606952619,"library\/lib\/list.php":2717275603,"library\/lib\/formhandler.php":537501142,"library\/lib\/smarty.php":2293264594,"library\/lib\/auth0.php":339212395,"library\/lib\/form.php":3663512483,"library\/core.php":4062009106,"library\/ajax\/checkconnection.php":2829043822,"library\/ajax\/checkusersmenu.php":1412308190,"library\/ajax\/checktag.php":1975862772,"library\/ajax\/checkout.php":3113513100,"library\/ajax\/history.php":1716828443,"library\/ajax\/laundry.php":3276293907,"library\/ajax\/testdbdelete.php":756005152,"library\/ajax\/getsizes.php":3519708634,"library\/ajax\/deleteprofile.php":2533882383,"library\/ajax\/testauth0user.php":2245055750,"library\/ajax\/getproductvalue.php":471706149,"gcloud-entry.php":2138470965,"fake-error.php":1154330550,"mobile\/saveassignbox.php":3788262682,"mobile\/findbox.php":798410399,"mobile\/move.php":3027529769,"mobile\/editbox.php":1290150585,"mobile\/newbox.php":1543573806,"mobile\/changeamount.php":157843467,"mobile\/vieworders.php":1677133074,"mobile\/saveamount.php":2568294108,"mobile\/savebox.php":3157784365,"mobile\/barcode.php":1120610869,"mobile\/assignbox.php":3781059059,"mobile\/selectorganisation.php":1883160496,"mobile\/start.php":2011840417,"mobile.php":1636127788,"db\/migrations\/20210823064211_make_cms_users_id_unsigned.php":1570825843,"db\/migrations\/20220722085453_dirstro_events_table.php":3210796273,"db\/migrations\/20191105181704_add_unique_constraint_qr_code_legacy.php":2658378860,"db\/migrations\/20220515130043_rename_people_idto_object_idin_tags_relations.php":4151494876,"db\/migrations\/20200202170149_set_visible_default_to_one_in_locations_table.php":623540014,"db\/migrations\/20190912133947_foreign_key_camps.php":2594014028,"db\/migrations\/20190923140058_foreign_key_locations.php":1888768824,"db\/migrations\/20201213100955_update_delete_constraint_for_tags.php":1271378129,"db\/migrations\/20190925135319_foreign_keys_library_tables.php":1543462644,"db\/migrations\/20220723060012_dirstro_events_unboxed_item_collections.php":3419017542,"db\/migrations\/20220605074623_make_product_sizegroup_id_not_nullable.php":2465419270,"db\/migrations\/20191202131340_adult_age_in_camps_table_not_null.php":2157585719,"db\/migrations\/20191019135153_change_fk_in_sizes_to_sizegroup.php":3623536441,"db\/migrations\/20220701094153_add_shipment_detail_table.php":130323627,"db\/migrations\/20190703090715_add_parent_id_in_product_categories.php":566936819,"db\/migrations\/20191001093637_foreign_key_people_id.php":3963704218,"db\/migrations\/20190721142832_add_signature_date_in_people.php":3855102369,"db\/migrations\/20190621183422_add_currency_name.php":2927936586,"db\/migrations\/20190610113824_initial_schema.php":936716246,"db\/migrations\/20200706220401_drop_organisation_id_from_cms_users.php":1199706058,"db\/migrations\/20190725174628_add_resettokens_column_to_bases.php":549113197,"db\/migrations\/20220701094148_add_shipment_table.php":3387659244,"db\/migrations\/20190623073649_make_organisation_in_cms_users_foreign_key.php":3123974099,"db\/migrations\/20220605064603_add_product_category_id_foreign_key.php":3231845789,"db\/migrations\/20200706225754_add_composite_unique_index_for_cross_reference_tables.php":2553895515,"db\/migrations\/20200313200406_remove_needed_items.php":316860497,"db\/migrations\/20191013180000_itemsout_nullable.php":2809417305,"db\/migrations\/20190612100627_add_station_to_laundry.php":630871444,"db\/migrations\/20220604185546_remove_portion_column_in_sizes.php":3404898057,"db\/migrations\/20200608185725_add_box_state.php":679118089,"db\/migrations\/20191211131857_make_people_id_in_transaction_table_nullable.php":3329127877,"db\/migrations\/20191021155925_add_fk_for_location_in_stock_table.php":636391107,"db\/migrations\/20220822183629_add_flow_direction.php":2882041663,"db\/migrations\/20210823070448_make_tag_id_unsigned.php":3134105588,"db\/migrations\/20220604184037_make_label_fields_not_nullable.php":2356467911,"db\/migrations\/20220701094045_add_transfer_agreement_table.php":71077700,"db\/migrations\/20220822175013_add_distro_event_tracking_group_id_column.php":3751198611,"db\/migrations\/20210823064828_make_gender_id_unsigned.php":1135418066,"db\/migrations\/20190923101044_foreign_keys_users.php":776872632,"db\/migrations\/20191005183100_foreign_key_remainder.php":3728839847,"db\/migrations\/20200203194629_make_user_id_nullable_in_history_table.php":136487971,"db\/migrations\/20220605061343_drop_product_category_id_foreign_key.php":874513478,"db\/migrations\/20220205073523_add_action_permissions_to_cms_functions.php":2023775355,"db\/migrations\/20191028074813_add_legacy_column_to_qr_table.php":2201915459,"db\/migrations\/20200206100256_add_is_scrap_flag_to_locations_table.php":4039753690,"db\/migrations\/20190703153854_allow_null_for_product_deleted_table.php":1192277270,"db\/migrations\/20190923105735_foreign_keys_language.php":3854558285,"db\/migrations\/20220515130202_add_object_type_in_tags_relations.php":2877247360,"db\/migrations\/20191001141152_foreign_key_sizes.php":4260308221,"db\/migrations\/20191019131459_change_cross_reference_delete_rule_to_cascade.php":4071001607,"db\/migrations\/20220605084444_create_composte_index_on_history_table.php":3945596615,"db\/migrations\/20190925105800_foreign_key_laundry_tables.php":883030129,"db\/migrations\/20220605075402_make_product_camp_id_not_nullable.php":324164983,"db\/migrations\/20220604165328_remove_underscore_columns.php":2148197044,"db\/migrations\/20190701120113_fix_usergroups_foreign_key.php":504355617,"db\/migrations\/20220602091709_add_seq_to_tags.php":4156736457,"db\/migrations\/20190623123844_add_foreign_keys_in_user_mgmt.php":1672187917,"db\/migrations\/20190930225021_foreign_key_qr.php":2409950935,"db\/migrations\/20220822191744_rename_distro_events_outflow_logs.php":3305293207,"db\/migrations\/20220604182719_make_items_in_stock_nullable.php":194597125,"db\/migrations\/20190613224510_usergroups_levels.php":1136812791,"db\/migrations\/20220513080431_add_type_to_tags.php":3242045660,"db\/migrations\/20210314130614_unique_constraint_qr_id_in_stock_table.php":4116395157,"db\/migrations\/20190703082355_add_product_foreign_keys.php":2672831457,"db\/migrations\/20210823063551_make_cms_functions_id_unsigned.php":4074203232,"db\/migrations\/20210823070205_make_size_id_unsigned.php":335118334,"db\/migrations\/20220723064611_add_distro_events_to_stock.php":3678316679,"db\/migrations\/20220604164558_make_comment_fields_nullable.php":2972121150,"db\/migrations\/20210822075141_make_box_state_id_unsigned.php":3239588825,"db\/migrations\/20220605074638_add_product_sizegroup_id_foreign_key.php":2265664489,"db\/migrations\/20190613211018_new_user_mgmt.php":913677027,"db\/migrations\/20220822172951_distro_events_tracking_groups.php":3028743556,"db\/migrations\/20220723063203_add_distro_events_columns_to_locations.php":1610910450,"db\/migrations\/20191024152307_add_missing_fks.php":1375127678,"db\/migrations\/20210823070632_make_transaction_id_unsigned.php":540471474,"db\/migrations\/20200824185532_create_people_tag_cross_reference.php":862781590,"db\/migrations\/20220701094049_add_transfer_agreement_detail_table.php":2663553891,"db\/migrations\/20190703145717_clean_up_products_table.php":3422322940,"db\/migrations\/20220605081726_drop_product_amountneeded_column.php":1458697845,"db\/migrations\/20220822191943_add_distro_event_tracking_group_id_foreign_key.php":783263583,"db\/migrations\/20191105181657_add_unique_constraint_stock_boxid.php":1016325404,"db\/migrations\/20220605075347_drop_product_camp_id_foreign_key.php":1975487739,"db\/migrations\/20220822182632_drop_distro_event_id_foreign_key.php":2647542846,"db\/migrations\/20190622184117_add_organization_ids_to_cms_users_table.php":900699486,"db\/migrations\/20190623140300_add_deleted_column_to_organisations.php":1431972350,"db\/migrations\/20191027225630_add_deleted_column_to_locations.php":175718580,"db\/migrations\/20220723052618_dirstro_events_packing_list_entries.php":1747560662,"db\/migrations\/schema.php":1312806946,"db\/migrations\/20220205084503_add_cms_user_groups_roles.php":2872690713,"db\/migrations\/20220605075413_add_product_camp_id_foreign_key.php":3704324266,"db\/migrations\/20210823065128_make_location_id_unsigned.php":1655779809,"db\/migrations\/20210823065917_make_product_id_unsigned.php":2103701633,"db\/migrations\/20190616152410_after_rotterdam_sprint.php":3406119954,"db\/migrations\/20220605064416_make_product_category_id_not_nullable.php":3961520852,"db\/migrations\/20220513124241_alter_people_tags_to_tags_relations.php":1245118699,"db\/migrations\/20191202135024_user_id_in_transactions_nullable.php":3745728764,"db\/migrations\/20190924152152_users_created_modified.php":1251746086,"db\/migrations\/20191001145902_foreign_key_product.php":168020102,"db\/migrations\/20210130175622_add_settings_for_bases.php":2845632372,"db\/migrations\/20210823065359_make_people_id_unsigned.php":896509850,"db\/migrations\/20200923172713_add_tag_description.php":723682490,"db\/migrations\/20190927155724_foreign_key_borrow_tables.php":2619756246,"db\/migrations\/20190614143640_add_organisation_column.php":1117313692,"db\/migrations\/20191019134931_change_fk_in_products_to_camps.php":1122730554,"db\/migrations\/20191023152307_change_collation_and_encoding_to_utf8.php":158149719,"db\/migrations\/20191005183200_foreign_key_cmsfunctions.php":1053932538,"db\/migrations\/20190623100406_add_deleted_column_to_usergroups.php":1305567125,"db\/migrations\/20200824171337_add_tag_table.php":4126316136,"db\/migrations\/20220605074604_drop_product_sizegroup_id_foreign_key.php":2250072532,"db\/migrations\/20220723061731_dirstro_events_outflow_logs.php":2826153876,"db\/seeds\/ActionPermissions.php":3680892294,"db\/seeds\/Demo.php":786032162,"db\/seeds\/Cypress.php":358933697,"db\/seeds\/ClearDb.php":1287772410,"db\/seeds\/DemoUsers.php":2808328426,"db\/seeds\/Minimal.php":3402419281,"templates\/templates_c\/a9fb274994b13233b9f7b1b6679509b0159ffd16_3.file.cms_error.tpl.php":2609297738,"templates\/templates_c\/f557abdc2782601b4ead697e334efe54b9e0350f_3.file.cms_index.tpl.php":900723381,"templates\/templates_c\/8521a60ec97f4a1bd777017e2875965655bed61c_3.file.start-market.tpl.php":3304082740,"build\/jsmin-1.1.1.php":185195618,"build\/pack-css.php":3430214670,"build\/pack-js.php":2392791340,"build\/compile-smarty.php":829675069,"cron\/reseed-auth0.php":2646110689,"cron\/reseed-roles-auth0.php":1883407739,"cron\/reseed-db.php":3313190927,"cron\/dailyroutine.php":2490402586}}

.vscode/extensions.json

@@ -6,7 +6,7 @@
 	"recommendations": [
 		"xdebug.php-debug",
 		"bmewburn.vscode-intelephense-client",
-		"fterrag.vscode-php-cs-fixer"
+		"junstyle.php-cs-fixer"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": [

.vscode/launch.json

@@ -4,14 +4,14 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-
         {
             "name": "Listen for XDebug",
             "type": "php",
             "request": "launch",
             "port": 9003,
             "pathMappings": {
-                "/var/www/html": "${workspaceFolder}"},
+                "/var/www/html": "${workspaceFolder}"
+            },
             "log": true
         },
         {

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
     "[php]": {
         "editor.formatOnSave": true,
-        "editor.defaultFormatter": "fterrag.vscode-php-cs-fixer"
+        "editor.defaultFormatter": "junstyle.php-cs-fixer"
     },
     "php-cs-fixer.rules": "@PhpCsFixer",
     "intelephense.format.enable": false