@lando/symfony 1.3.0 → 1.4.1

package/.nyc_output/processinfo/61859fb3-ac68-45b8-b65b-22bcf941c388.json

@@ -0,0 +1 @@
+{"parent":null,"pid":1955,"argv":["/opt/hostedtoolcache/node/18.19.1/x64/bin/node","/home/runner/work/symfony/symfony/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/symfony/symfony","time":1709611417411,"ppid":1944,"coverageFilename":"/home/runner/work/symfony/symfony/.nyc_output/61859fb3-ac68-45b8-b65b-22bcf941c388.json","externalId":"","uuid":"61859fb3-ac68-45b8-b65b-22bcf941c388","files":[]}

package/.nyc_output/processinfo/a404ca81-f26d-4a98-b687-edb7c07118ad.json

@@ -0,0 +1 @@
+{"parent":null,"pid":1944,"argv":["/opt/hostedtoolcache/node/18.19.1/x64/bin/node","/home/runner/work/symfony/symfony/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/symfony/symfony","time":1709611417254,"ppid":1943,"coverageFilename":"/home/runner/work/symfony/symfony/.nyc_output/a404ca81-f26d-4a98-b687-edb7c07118ad.json","externalId":"","uuid":"a404ca81-f26d-4a98-b687-edb7c07118ad","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"ab9d0f17-1878-4f8b-9fdc-274a42304209":{"parent":null,"children":[]},"dcd4683f-c215-4a0e-bf8e-0b85e0ab5e93":{"parent":null,"children":[]}},"files":{},"externalIds":{}}
+{"processes":{"61859fb3-ac68-45b8-b65b-22bcf941c388":{"parent":null,"children":[]},"a404ca81-f26d-4a98-b687-edb7c07118ad":{"parent":null,"children":[]}},"files":{},"externalIds":{}}

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v1.4.1 - [March 4, 2024](https://github.com/lando/symfony/releases/tag/v1.4.1)
+
+### Fixes
+
+* Improved `database` selection for purposes of `config` loading, fixes some `database` bootup issues when the `database` type is overriden downstream
+
+## v1.4.0 - [February 22, 2024](https://github.com/lando/symfony/releases/tag/v1.4.0)
+
+### Fixes
+
+* Fixed `CRITICAL` issue with default config files not loading correctly.
+
 ## v1.3.0 - [February 21, 2024](https://github.com/lando/symfony/releases/tag/v1.3.0)
 
 * Updated memcached plugin to [v1.1.0](https://github.com/lando/memcached/releases/tag/v1.1.0).

package/builders/symfony.js

@@ -74,7 +74,16 @@ const getServiceConfig = (options, types = ['php', 'server', 'vhosts']) => {
   return config;
 };
 
-// Tooling defaults
+/*
+ * Helper to get database type
+ */
+const getDatabaseType = options => {
+  return _.get(options, '_app.config.services.database.type', options.database) ?? 'mysql';
+};
+
+/*
+ * Tooling defaults
+ */
 const toolingDefaults = {
   'composer': {
     service: 'appserver',
@@ -172,11 +181,12 @@ const getConfigDefaults = options => {
   // Get the viaconf
   if (_.startsWith(options.via, 'nginx')) options.defaultFiles.vhosts = 'default.conf.tpl';
 
-  // Get the default db conf
-  const dbConfig = _.get(options, 'database', 'mysql');
+  // attempt to discover the database that is actually being used
+  // @NOTE: this will look to see if database is overridden
+  const dbConfig = getDatabaseType(options);
   const database = _.first(dbConfig.split(':'));
   const version = _.last(dbConfig.split(':')).substring(0, 2);
-  if (database === 'mysql' || database === 'mariadb') {
+  if (database === 'symfony-mysql' || database === 'mysql' || database === 'mariadb') {
     if (version === '8.') {
       options.defaultFiles.database = 'mysql8.cnf';
     } else {
@@ -190,6 +200,8 @@ const getConfigDefaults = options => {
       delete options.defaultFiles[type];
     }
   });
+
+  return options.defaultFiles;
 };
 
 /*

package/config/default.conf.tpl

@@ -1,3 +1,5 @@
+# LANDOSYMFONYNGINXCONF
+
 server {
 
     listen 80 default_server;

package/config/{mysql.conf → mysql.cnf}

@@ -1,6 +1,8 @@
 #
 # The MySQL database server configuration file for Lando
 #
+# LANDOSYMFONYMYSQLCNF
+
 
 [mysqld]
 #
@@ -71,7 +73,7 @@ max_binlog_size = 100M
 #innodb_buffer_pool_size = 384M
 #innodb_additional_mem_pool_size = 20M
 # Set .._log_file_size to 25 % of buffer pool size
-innodb_log_file_size = 100M
+innodb_log_file_size = 101M
 #innodb_log_buffer_size = 8M
 innodb_flush_log_at_trx_commit = 0
 #innodb_lock_wait_timeout = 50
@@ -82,7 +84,7 @@ innodb_open_files       = 256
 innodb_io_capacity      = 512
 innodb_flush_method     = O_DIRECT
 innodb_thread_concurrency = 8
-innodb_lock_wait_timeout = 120
+innodb_lock_wait_timeout = 121
 #
 # * Security Features
 #

package/config/mysql8.cnf

@@ -1,6 +1,7 @@
 #
 # The MySQL database server configuration file for Lando
 #
+# LANDOSYMFONYMYSQL8CNF
 
 [mysqld]
 #
@@ -49,7 +50,7 @@ read_buffer_size = 2M
 #server-id    = 1
 #log_bin      = /src/.lando/log/mysql-bin.log
 expire_logs_days = 10
-max_binlog_size = 100M
+max_binlog_size = 101M
 #binlog_do_db   = include_database_name
 #binlog_ignore_db = include_database_name
 #
@@ -77,7 +78,7 @@ innodb_open_files       = 256
 innodb_io_capacity      = 512
 innodb_flush_method     = O_DIRECT
 innodb_thread_concurrency = 8
-innodb_lock_wait_timeout = 120
+innodb_lock_wait_timeout = 127
 #
 # * Security Features
 #

package/config/php.ini

@@ -1,5 +1,7 @@
 [PHP]
 
+; LANDOSYMFONYPHPINI
+
 ;;;;;;;;;;;;;;;
 ; PHP Globals ;
 ;;;;;;;;;;;;;;;
@@ -33,8 +35,8 @@ xdebug.collect_params = 0
 
 ; Globals
 expose_php = on
-max_execution_time = 90
-max_input_time = 900
+max_execution_time = 91
+max_input_time = 901
 max_input_vars = 10000
 memory_limit = ${PHP_MEMORY_LIMIT}
 upload_max_filesize = 100M

package/coverage/index.html

@@ -86,7 +86,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-02-21T19:46:23.023Z
+                at 2024-03-05T04:03:37.605Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/symfony",
   "description": "A Lando plugin that provides a tight integration with Symfony.",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/symfony",
@@ -79,9 +79,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-Z5oPUbrUgEvIq8ROSzEfrPN2OTKyki93qfSTjam0Q+TCWqVqnQrOud13POXSPZ/j+ek0eimF+XRwJ5H0KVlpjA==",
-    "shasum": "2968fefd74d32463009112944c8a886e7cf9f5c4",
-    "filename": "lando-symfony-1.3.0.tgz",
-    "unpackedSize": 16648874
+    "integrity": "sha512-Wc0sW0+RQdHjOdiOsi7qHVzNjL6TGlYDMcOaITuwHTg+dljPXKD1opSxq/Mgj7EH4nFNo+30s3NbsizFJToICA==",
+    "shasum": "512c730edf345aa78a66f0efee9eca2a6e44627f",
+    "filename": "lando-symfony-1.4.1.tgz",
+    "unpackedSize": 16649716
   }
 }

package/.nyc_output/processinfo/ab9d0f17-1878-4f8b-9fdc-274a42304209.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1864,"argv":["/opt/hostedtoolcache/node/18.19.1/x64/bin/node","/home/runner/work/symfony/symfony/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/symfony/symfony","time":1708544782819,"ppid":1853,"coverageFilename":"/home/runner/work/symfony/symfony/.nyc_output/ab9d0f17-1878-4f8b-9fdc-274a42304209.json","externalId":"","uuid":"ab9d0f17-1878-4f8b-9fdc-274a42304209","files":[]}

package/.nyc_output/processinfo/dcd4683f-c215-4a0e-bf8e-0b85e0ab5e93.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1853,"argv":["/opt/hostedtoolcache/node/18.19.1/x64/bin/node","/home/runner/work/symfony/symfony/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/symfony/symfony","time":1708544782660,"ppid":1852,"coverageFilename":"/home/runner/work/symfony/symfony/.nyc_output/dcd4683f-c215-4a0e-bf8e-0b85e0ab5e93.json","externalId":"","uuid":"dcd4683f-c215-4a0e-bf8e-0b85e0ab5e93","files":[]}