@lando/symfony 1.4.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":{"32ccf25d-b710-4efa-821a-5693e4df67d3":{"parent":null,"children":[]},"7032bc41-5dac-4d49-b79c-680a53cb1063":{"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,9 @@
+## 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

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 {

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-23T00:41:51.819Z
+                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.4.0",
+  "version": "1.4.1",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/symfony",
@@ -79,9 +79,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-ARGTzdsTD3m5Vdy0zjCvZpcHAY3lTQb98VVX+jfmssaZIwwwKIEP5rLLj2El7W7+XVhLy0w+TvQmfxS1ec8RyQ==",
-    "shasum": "224067ef35e184ae490db1ba91be7a7a18f9b024",
-    "filename": "lando-symfony-1.4.0.tgz",
-    "unpackedSize": 16649174
+    "integrity": "sha512-Wc0sW0+RQdHjOdiOsi7qHVzNjL6TGlYDMcOaITuwHTg+dljPXKD1opSxq/Mgj7EH4nFNo+30s3NbsizFJToICA==",
+    "shasum": "512c730edf345aa78a66f0efee9eca2a6e44627f",
+    "filename": "lando-symfony-1.4.1.tgz",
+    "unpackedSize": 16649716
   }
 }

package/.nyc_output/processinfo/32ccf25d-b710-4efa-821a-5693e4df67d3.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1870,"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":1708648911623,"ppid":1859,"coverageFilename":"/home/runner/work/symfony/symfony/.nyc_output/32ccf25d-b710-4efa-821a-5693e4df67d3.json","externalId":"","uuid":"32ccf25d-b710-4efa-821a-5693e4df67d3","files":[]}

package/.nyc_output/processinfo/7032bc41-5dac-4d49-b79c-680a53cb1063.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1859,"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":1708648911471,"ppid":1858,"coverageFilename":"/home/runner/work/symfony/symfony/.nyc_output/7032bc41-5dac-4d49-b79c-680a53cb1063.json","externalId":"","uuid":"7032bc41-5dac-4d49-b79c-680a53cb1063","files":[]}