@lando/laravel 1.2.0 → 1.3.1

package/.nyc_output/processinfo/16689bc2-5921-4d0c-98df-ecf13f5ae64f.json

@@ -0,0 +1 @@
+{"parent":null,"pid":1858,"argv":["/opt/hostedtoolcache/node/18.19.1/x64/bin/node","/home/runner/work/laravel/laravel/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/laravel/laravel","time":1709221105911,"ppid":1857,"coverageFilename":"/home/runner/work/laravel/laravel/.nyc_output/16689bc2-5921-4d0c-98df-ecf13f5ae64f.json","externalId":"","uuid":"16689bc2-5921-4d0c-98df-ecf13f5ae64f","files":[]}

package/.nyc_output/processinfo/7f7842bc-1fdd-4513-9d7b-b6d734676407.json

@@ -0,0 +1 @@
+{"parent":null,"pid":1869,"argv":["/opt/hostedtoolcache/node/18.19.1/x64/bin/node","/home/runner/work/laravel/laravel/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/laravel/laravel","time":1709221106073,"ppid":1858,"coverageFilename":"/home/runner/work/laravel/laravel/.nyc_output/7f7842bc-1fdd-4513-9d7b-b6d734676407.json","externalId":"","uuid":"7f7842bc-1fdd-4513-9d7b-b6d734676407","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"5a86f407-563a-4d59-ae7e-2fb8fd8a5915":{"parent":null,"children":[]},"ad0cae22-5077-448c-ac88-8262da7a54d8":{"parent":null,"children":[]}},"files":{},"externalIds":{}}
+{"processes":{"16689bc2-5921-4d0c-98df-ecf13f5ae64f":{"parent":null,"children":[]},"7f7842bc-1fdd-4513-9d7b-b6d734676407":{"parent":null,"children":[]}},"files":{},"externalIds":{}}

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+
+## v1.3.1 - [February 29, 2024](https://github.com/lando/laravel/releases/tag/v1.3.1)
+
+### Fixes
+
+* Improved `database` selection for purposes of `config` loading, fixes some `database` bootup issues when the `database` type is overriden downstream
+
+## v1.3.0 - [February 27, 2024](https://github.com/lando/laravel/releases/tag/v1.3.0)
+
+### New Features
+
+* Makes `php:8.3` the default version. [#45](https://github.com/lando/laravel/issues/45)
+* Added support for `php:8.3`
+* Added support for `php:8.2` [#23](https://github.com/lando/laravel/issues/23)
+* Make sure path to mysql.cnf is correct.
+
+### Internal
+
+* Updated to `@lando/php@1.2.0`
+
 ## v1.2.0 - [February 21, 2024](https://github.com/lando/laravel/releases/tag/v1.2.0)
 
 * Updated memcached plugin to [v1.1.0](https://github.com/lando/memcached/releases/tag/v1.1.0).
@@ -12,7 +32,7 @@
 * Fixed issue with missing proxy URLs.
 
 ## v1.0.0 - [December 7, 2023](https://github.com/lando/laravel/releases/tag/v1.0.0)
-  
+
 * Dialed fully for `lando update`
 
 ## v0.9.0 - [July 3, 2023](https://github.com/lando/laravel/releases/tag/v0.9.0)

package/builders/laravel.js

@@ -26,6 +26,13 @@ const getCache = cache => {
   }
 };
 
+/*
+ * Helper to get database type
+ */
+const getDatabaseType = options => {
+  return _.get(options, '_app.config.services.database.type', options.database) ?? 'mysql';
+};
+
 // Tooling defaults
 const toolingDefaults = {
   'composer': {
@@ -105,11 +112,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 === 'laravel-mysql' || database === 'mysql' || database === 'mariadb') {
     if (version === '8.') {
       options.defaultFiles.database = 'mysql8.cnf';
     } else {
@@ -213,7 +221,7 @@ module.exports = {
     defaultFiles: {
       php: 'php.ini',
     },
-    php: '7.4',
+    php: '8.3',
     services: {appserver: {overrides: {environment: {
       APP_LOG: 'errorlog',
     }}}},
@@ -243,6 +251,7 @@ module.exports = {
       options.defaultFiles = _.merge({}, getConfigDefaults(_.cloneDeep(options)), options.defaultFiles);
       options.services = _.merge({}, getServices(options), options.services);
       options.tooling = _.merge({}, getTooling(options), options.tooling);
+
       // Add in artisan tooling
       // @NOTE: does artisan always live one up of the webroot?
       options.tooling.artisan = {

package/config/default.conf.tpl

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

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

@@ -1,6 +1,7 @@
 #
 # The MySQL database server configuration file for Lando
 #
+# LANDOLARAVELMYSQLCNF
 
 [mysqld]
 #
@@ -71,7 +72,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 +83,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
 #
+# LANDOLARAVELMYSQL8CNF
 
 [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,6 @@
 [PHP]
 
+; LANDOLARAVELPHPINI
 ;;;;;;;;;;;;;;;
 ; PHP Globals ;
 ;;;;;;;;;;;;;;;
@@ -36,8 +37,8 @@ xdebug.mode = ${XDEBUG_MODE}
 
 ; 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-21T20:07:30.557Z
+                at 2024-02-29T15:38:26.270Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/laravel",
   "description": "A Lando plugin that provides a tight integration with Laravel.",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/laravel",
@@ -77,9 +77,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-Q93bYskQ4PQ5FUIS0/ZDRTO547OhHoTyqGZ+a8Kmm3RWPr4n4xCVMWU15xGfMBYJYyJJxMzcWT5ureJ5JCbfUg==",
-    "shasum": "8326c8786bb0caf8bd9ebd3a86f21dcd2d048347",
-    "filename": "lando-laravel-1.2.0.tgz",
-    "unpackedSize": 15124005
+    "integrity": "sha512-/vH+X8mJblSoiyzX27LBm/vRvMfp+6MNjWt6i2q7nNAyVb3hD78j/8H/cA53m7obbvR3EBygIaCsxge1TTvVvw==",
+    "shasum": "04a8f3d4d383460c3e6e8979d47427514f232265",
+    "filename": "lando-laravel-1.3.1.tgz",
+    "unpackedSize": 15125031
   }
 }

package/.nyc_output/processinfo/5a86f407-563a-4d59-ae7e-2fb8fd8a5915.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1919,"argv":["/opt/hostedtoolcache/node/18.19.1/x64/bin/node","/home/runner/work/laravel/laravel/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/laravel/laravel","time":1708546050364,"ppid":1908,"coverageFilename":"/home/runner/work/laravel/laravel/.nyc_output/5a86f407-563a-4d59-ae7e-2fb8fd8a5915.json","externalId":"","uuid":"5a86f407-563a-4d59-ae7e-2fb8fd8a5915","files":[]}

package/.nyc_output/processinfo/ad0cae22-5077-448c-ac88-8262da7a54d8.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1908,"argv":["/opt/hostedtoolcache/node/18.19.1/x64/bin/node","/home/runner/work/laravel/laravel/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/laravel/laravel","time":1708546050205,"ppid":1907,"coverageFilename":"/home/runner/work/laravel/laravel/.nyc_output/ad0cae22-5077-448c-ac88-8262da7a54d8.json","externalId":"","uuid":"ad0cae22-5077-448c-ac88-8262da7a54d8","files":[]}