[Ilya Priven](https://github.com/ikonst "+91/-8 (#5987 )")
+- 
[Zao Soula](https://github.com/zaosoula "+6/-6 (#5778 )")
+
## [1.6.5](https://github.com/axios/axios/compare/v1.6.4...v1.6.5) (2024-01-05)
diff --git a/node_modules/axios/dist/axios.js b/node_modules/axios/dist/axios.js
index 12d4a38c..642d0305 100644
--- a/node_modules/axios/dist/axios.js
+++ b/node_modules/axios/dist/axios.js
@@ -1,4 +1,4 @@
-// Axios v1.6.5 Copyright (c) 2024 Matt Zabriskie and contributors
+// Axios v1.6.6 Copyright (c) 2024 Matt Zabriskie and contributors
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
typeof define === 'function' && define.amd ? define(factory) :
@@ -26,6 +26,297 @@
}
return target;
}
+ function _regeneratorRuntime() {
+ _regeneratorRuntime = function () {
+ return exports;
+ };
+ var exports = {},
+ Op = Object.prototype,
+ hasOwn = Op.hasOwnProperty,
+ $Symbol = "function" == typeof Symbol ? Symbol : {},
+ iteratorSymbol = $Symbol.iterator || "@@iterator",
+ asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator",
+ toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag";
+ function define(obj, key, value) {
+ return Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: !0,
+ configurable: !0,
+ writable: !0
+ }), obj[key];
+ }
+ try {
+ define({}, "");
+ } catch (err) {
+ define = function (obj, key, value) {
+ return obj[key] = value;
+ };
+ }
+ function wrap(innerFn, outerFn, self, tryLocsList) {
+ var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator,
+ generator = Object.create(protoGenerator.prototype),
+ context = new Context(tryLocsList || []);
+ return generator._invoke = function (innerFn, self, context) {
+ var state = "suspendedStart";
+ return function (method, arg) {
+ if ("executing" === state) throw new Error("Generator is already running");
+ if ("completed" === state) {
+ if ("throw" === method) throw arg;
+ return doneResult();
+ }
+ for (context.method = method, context.arg = arg;;) {
+ var delegate = context.delegate;
+ if (delegate) {
+ var delegateResult = maybeInvokeDelegate(delegate, context);
+ if (delegateResult) {
+ if (delegateResult === ContinueSentinel) continue;
+ return delegateResult;
+ }
+ }
+ if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) {
+ if ("suspendedStart" === state) throw state = "completed", context.arg;
+ context.dispatchException(context.arg);
+ } else "return" === context.method && context.abrupt("return", context.arg);
+ state = "executing";
+ var record = tryCatch(innerFn, self, context);
+ if ("normal" === record.type) {
+ if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue;
+ return {
+ value: record.arg,
+ done: context.done
+ };
+ }
+ "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg);
+ }
+ };
+ }(innerFn, self, context), generator;
+ }
+ function tryCatch(fn, obj, arg) {
+ try {
+ return {
+ type: "normal",
+ arg: fn.call(obj, arg)
+ };
+ } catch (err) {
+ return {
+ type: "throw",
+ arg: err
+ };
+ }
+ }
+ exports.wrap = wrap;
+ var ContinueSentinel = {};
+ function Generator() {}
+ function GeneratorFunction() {}
+ function GeneratorFunctionPrototype() {}
+ var IteratorPrototype = {};
+ define(IteratorPrototype, iteratorSymbol, function () {
+ return this;
+ });
+ var getProto = Object.getPrototypeOf,
+ NativeIteratorPrototype = getProto && getProto(getProto(values([])));
+ NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype);
+ var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype);
+ function defineIteratorMethods(prototype) {
+ ["next", "throw", "return"].forEach(function (method) {
+ define(prototype, method, function (arg) {
+ return this._invoke(method, arg);
+ });
+ });
+ }
+ function AsyncIterator(generator, PromiseImpl) {
+ function invoke(method, arg, resolve, reject) {
+ var record = tryCatch(generator[method], generator, arg);
+ if ("throw" !== record.type) {
+ var result = record.arg,
+ value = result.value;
+ return value && "object" == typeof value && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) {
+ invoke("next", value, resolve, reject);
+ }, function (err) {
+ invoke("throw", err, resolve, reject);
+ }) : PromiseImpl.resolve(value).then(function (unwrapped) {
+ result.value = unwrapped, resolve(result);
+ }, function (error) {
+ return invoke("throw", error, resolve, reject);
+ });
+ }
+ reject(record.arg);
+ }
+ var previousPromise;
+ this._invoke = function (method, arg) {
+ function callInvokeWithMethodAndArg() {
+ return new PromiseImpl(function (resolve, reject) {
+ invoke(method, arg, resolve, reject);
+ });
+ }
+ return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
+ };
+ }
+ function maybeInvokeDelegate(delegate, context) {
+ var method = delegate.iterator[context.method];
+ if (undefined === method) {
+ if (context.delegate = null, "throw" === context.method) {
+ if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel;
+ context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method");
+ }
+ return ContinueSentinel;
+ }
+ var record = tryCatch(method, delegate.iterator, context.arg);
+ if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel;
+ var info = record.arg;
+ return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel);
+ }
+ function pushTryEntry(locs) {
+ var entry = {
+ tryLoc: locs[0]
+ };
+ 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry);
+ }
+ function resetTryEntry(entry) {
+ var record = entry.completion || {};
+ record.type = "normal", delete record.arg, entry.completion = record;
+ }
+ function Context(tryLocsList) {
+ this.tryEntries = [{
+ tryLoc: "root"
+ }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0);
+ }
+ function values(iterable) {
+ if (iterable) {
+ var iteratorMethod = iterable[iteratorSymbol];
+ if (iteratorMethod) return iteratorMethod.call(iterable);
+ if ("function" == typeof iterable.next) return iterable;
+ if (!isNaN(iterable.length)) {
+ var i = -1,
+ next = function next() {
+ for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next;
+ return next.value = undefined, next.done = !0, next;
+ };
+ return next.next = next;
+ }
+ }
+ return {
+ next: doneResult
+ };
+ }
+ function doneResult() {
+ return {
+ value: undefined,
+ done: !0
+ };
+ }
+ return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) {
+ var ctor = "function" == typeof genFun && genFun.constructor;
+ return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name));
+ }, exports.mark = function (genFun) {
+ return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun;
+ }, exports.awrap = function (arg) {
+ return {
+ __await: arg
+ };
+ }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () {
+ return this;
+ }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) {
+ void 0 === PromiseImpl && (PromiseImpl = Promise);
+ var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl);
+ return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) {
+ return result.done ? result.value : iter.next();
+ });
+ }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () {
+ return this;
+ }), define(Gp, "toString", function () {
+ return "[object Generator]";
+ }), exports.keys = function (object) {
+ var keys = [];
+ for (var key in object) keys.push(key);
+ return keys.reverse(), function next() {
+ for (; keys.length;) {
+ var key = keys.pop();
+ if (key in object) return next.value = key, next.done = !1, next;
+ }
+ return next.done = !0, next;
+ };
+ }, exports.values = values, Context.prototype = {
+ constructor: Context,
+ reset: function (skipTempReset) {
+ if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined);
+ },
+ stop: function () {
+ this.done = !0;
+ var rootRecord = this.tryEntries[0].completion;
+ if ("throw" === rootRecord.type) throw rootRecord.arg;
+ return this.rval;
+ },
+ dispatchException: function (exception) {
+ if (this.done) throw exception;
+ var context = this;
+ function handle(loc, caught) {
+ return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught;
+ }
+ for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+ var entry = this.tryEntries[i],
+ record = entry.completion;
+ if ("root" === entry.tryLoc) return handle("end");
+ if (entry.tryLoc <= this.prev) {
+ var hasCatch = hasOwn.call(entry, "catchLoc"),
+ hasFinally = hasOwn.call(entry, "finallyLoc");
+ if (hasCatch && hasFinally) {
+ if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0);
+ if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc);
+ } else if (hasCatch) {
+ if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0);
+ } else {
+ if (!hasFinally) throw new Error("try statement without catch or finally");
+ if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc);
+ }
+ }
+ }
+ },
+ abrupt: function (type, arg) {
+ for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+ var entry = this.tryEntries[i];
+ if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) {
+ var finallyEntry = entry;
+ break;
+ }
+ }
+ finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null);
+ var record = finallyEntry ? finallyEntry.completion : {};
+ return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record);
+ },
+ complete: function (record, afterLoc) {
+ if ("throw" === record.type) throw record.arg;
+ return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel;
+ },
+ finish: function (finallyLoc) {
+ for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+ var entry = this.tryEntries[i];
+ if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel;
+ }
+ },
+ catch: function (tryLoc) {
+ for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+ var entry = this.tryEntries[i];
+ if (entry.tryLoc === tryLoc) {
+ var record = entry.completion;
+ if ("throw" === record.type) {
+ var thrown = record.arg;
+ resetTryEntry(entry);
+ }
+ return thrown;
+ }
+ }
+ throw new Error("illegal catch attempt");
+ },
+ delegateYield: function (iterable, resultName, nextLoc) {
+ return this.delegate = {
+ iterator: values(iterable),
+ resultName: resultName,
+ nextLoc: nextLoc
+ }, "next" === this.method && (this.arg = undefined), ContinueSentinel;
+ }
+ }, exports;
+ }
function _typeof(obj) {
"@babel/helpers - typeof";
@@ -35,6 +326,36 @@
return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
}, _typeof(obj);
}
+ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+ try {
+ var info = gen[key](arg);
+ var value = info.value;
+ } catch (error) {
+ reject(error);
+ return;
+ }
+ if (info.done) {
+ resolve(value);
+ } else {
+ Promise.resolve(value).then(_next, _throw);
+ }
+ }
+ function _asyncToGenerator(fn) {
+ return function () {
+ var self = this,
+ args = arguments;
+ return new Promise(function (resolve, reject) {
+ var gen = fn.apply(self, args);
+ function _next(value) {
+ asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+ }
+ function _throw(err) {
+ asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+ }
+ _next(undefined);
+ });
+ };
+ }
function _classCallCheck(instance, Constructor) {
if (!(instance instanceof Constructor)) {
throw new TypeError("Cannot call a class as a function");
@@ -2520,7 +2841,7 @@
return config;
}
- var VERSION = "1.6.5";
+ var VERSION = "1.6.6";
var validators$1 = {};
@@ -2626,7 +2947,49 @@
*/
_createClass(Axios, [{
key: "request",
- value: function request(configOrUrl, config) {
+ value: function () {
+ var _request2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(configOrUrl, config) {
+ var dummy;
+ return _regeneratorRuntime().wrap(function _callee$(_context) {
+ while (1) {
+ switch (_context.prev = _context.next) {
+ case 0:
+ _context.prev = 0;
+ _context.next = 3;
+ return this._request(configOrUrl, config);
+ case 3:
+ return _context.abrupt("return", _context.sent);
+ case 6:
+ _context.prev = 6;
+ _context.t0 = _context["catch"](0);
+ dummy = {};
+ if (Error.captureStackTrace) {
+ Error.captureStackTrace(dummy);
+ } else {
+ dummy.stack = new Error().stack;
+ }
+ // slice off the Error: ... line
+ dummy.stack = dummy.stack.replace(/^.+\n/, '');
+ // match without the 2 top stack lines
+ if (!_context.t0.stack.endsWith(dummy.stack.replace(/^.+\n.+\n/, ''))) {
+ _context.t0.stack += '\n' + dummy.stack;
+ }
+ throw _context.t0;
+ case 13:
+ case "end":
+ return _context.stop();
+ }
+ }
+ }, _callee, this, [[0, 6]]);
+ }));
+ function request(_x, _x2) {
+ return _request2.apply(this, arguments);
+ }
+ return request;
+ }()
+ }, {
+ key: "_request",
+ value: function _request(configOrUrl, config) {
/*eslint no-param-reassign:0*/
// Allow for axios('example/url'[, config]) a la fetch API
if (typeof configOrUrl === 'string') {
diff --git a/node_modules/axios/dist/axios.js.map b/node_modules/axios/dist/axios.js.map
index 48b83fd9..f54b26df 100644
--- a/node_modules/axios/dist/axios.js.map
+++ b/node_modules/axios/dist/axios.js.map
@@ -1 +1 @@
-{"version":3,"file":"axios.js","sources":["../lib/helpers/bind.js","../lib/utils.js","../lib/core/AxiosError.js","../lib/helpers/null.js","../lib/helpers/toFormData.js","../lib/helpers/AxiosURLSearchParams.js","../lib/helpers/buildURL.js","../lib/core/InterceptorManager.js","../lib/defaults/transitional.js","../lib/platform/browser/classes/URLSearchParams.js","../lib/platform/browser/classes/FormData.js","../lib/platform/browser/classes/Blob.js","../lib/platform/browser/index.js","../lib/platform/common/utils.js","../lib/platform/index.js","../lib/helpers/toURLEncodedForm.js","../lib/helpers/formDataToJSON.js","../lib/defaults/index.js","../lib/helpers/parseHeaders.js","../lib/core/AxiosHeaders.js","../lib/core/transformData.js","../lib/cancel/isCancel.js","../lib/cancel/CanceledError.js","../lib/core/settle.js","../lib/helpers/cookies.js","../lib/helpers/isAbsoluteURL.js","../lib/helpers/combineURLs.js","../lib/core/buildFullPath.js","../lib/helpers/isURLSameOrigin.js","../lib/helpers/parseProtocol.js","../lib/helpers/speedometer.js","../lib/adapters/xhr.js","../lib/adapters/adapters.js","../lib/core/dispatchRequest.js","../lib/core/mergeConfig.js","../lib/env/data.js","../lib/helpers/validator.js","../lib/core/Axios.js","../lib/cancel/CancelToken.js","../lib/helpers/spread.js","../lib/helpers/isAxiosError.js","../lib/helpers/HttpStatusCode.js","../lib/axios.js"],"sourcesContent":["'use strict';\n\nexport default function bind(fn, thisArg) {\n return function wrap() {\n return fn.apply(thisArg, arguments);\n };\n}\n","'use strict';\n\nimport bind from './helpers/bind.js';\n\n// utils is a library of generic helper functions non-specific to axios\n\nconst {toString} = Object.prototype;\nconst {getPrototypeOf} = Object;\n\nconst kindOf = (cache => thing => {\n const str = toString.call(thing);\n return cache[str] || (cache[str] = str.slice(8, -1).toLowerCase());\n})(Object.create(null));\n\nconst kindOfTest = (type) => {\n type = type.toLowerCase();\n return (thing) => kindOf(thing) === type\n}\n\nconst typeOfTest = type => thing => typeof thing === type;\n\n/**\n * Determine if a value is an Array\n *\n * @param {Object} val The value to test\n *\n * @returns {boolean} True if value is an Array, otherwise false\n */\nconst {isArray} = Array;\n\n/**\n * Determine if a value is undefined\n *\n * @param {*} val The value to test\n *\n * @returns {boolean} True if the value is undefined, otherwise false\n */\nconst isUndefined = typeOfTest('undefined');\n\n/**\n * Determine if a value is a Buffer\n *\n * @param {*} val The value to test\n *\n * @returns {boolean} True if value is a Buffer, otherwise false\n */\nfunction isBuffer(val) {\n return val !== null && !isUndefined(val) && val.constructor !== null && !isUndefined(val.constructor)\n && isFunction(val.constructor.isBuffer) && val.constructor.isBuffer(val);\n}\n\n/**\n * Determine if a value is an ArrayBuffer\n *\n * @param {*} val The value to test\n *\n * @returns {boolean} True if value is an ArrayBuffer, otherwise false\n */\nconst isArrayBuffer = kindOfTest('ArrayBuffer');\n\n\n/**\n * Determine if a value is a view on an ArrayBuffer\n *\n * @param {*} val The value to test\n *\n * @returns {boolean} True if value is a view on an ArrayBuffer, otherwise false\n */\nfunction isArrayBufferView(val) {\n let result;\n if ((typeof ArrayBuffer !== 'undefined') && (ArrayBuffer.isView)) {\n result = ArrayBuffer.isView(val);\n } else {\n result = (val) && (val.buffer) && (isArrayBuffer(val.buffer));\n }\n return result;\n}\n\n/**\n * Determine if a value is a String\n *\n * @param {*} val The value to test\n *\n * @returns {boolean} True if value is a String, otherwise false\n */\nconst isString = typeOfTest('string');\n\n/**\n * Determine if a value is a Function\n *\n * @param {*} val The value to test\n * @returns {boolean} True if value is a Function, otherwise false\n */\nconst isFunction = typeOfTest('function');\n\n/**\n * Determine if a value is a Number\n *\n * @param {*} val The value to test\n *\n * @returns {boolean} True if value is a Number, otherwise false\n */\nconst isNumber = typeOfTest('number');\n\n/**\n * Determine if a value is an Object\n *\n * @param {*} thing The value to test\n *\n * @returns {boolean} True if value is an Object, otherwise false\n */\nconst isObject = (thing) => thing !== null && typeof thing === 'object';\n\n/**\n * Determine if a value is a Boolean\n *\n * @param {*} thing The value to test\n * @returns {boolean} True if value is a Boolean, otherwise false\n */\nconst isBoolean = thing => thing === true || thing === false;\n\n/**\n * Determine if a value is a plain Object\n *\n * @param {*} val The value to test\n *\n * @returns {boolean} True if value is a plain Object, otherwise false\n */\nconst isPlainObject = (val) => {\n if (kindOf(val) !== 'object') {\n return false;\n }\n\n const prototype = getPrototypeOf(val);\n return (prototype === null || prototype === Object.prototype || Object.getPrototypeOf(prototype) === null) && !(Symbol.toStringTag in val) && !(Symbol.iterator in val);\n}\n\n/**\n * Determine if a value is a Date\n *\n * @param {*} val The value to test\n *\n * @returns {boolean} True if value is a Date, otherwise false\n */\nconst isDate = kindOfTest('Date');\n\n/**\n * Determine if a value is a File\n *\n * @param {*} val The value to test\n *\n * @returns {boolean} True if value is a File, otherwise false\n */\nconst isFile = kindOfTest('File');\n\n/**\n * Determine if a value is a Blob\n *\n * @param {*} val The value to test\n *\n * @returns {boolean} True if value is a Blob, otherwise false\n */\nconst isBlob = kindOfTest('Blob');\n\n/**\n * Determine if a value is a FileList\n *\n * @param {*} val The value to test\n *\n * @returns {boolean} True if value is a File, otherwise false\n */\nconst isFileList = kindOfTest('FileList');\n\n/**\n * Determine if a value is a Stream\n *\n * @param {*} val The value to test\n *\n * @returns {boolean} True if value is a Stream, otherwise false\n */\nconst isStream = (val) => isObject(val) && isFunction(val.pipe);\n\n/**\n * Determine if a value is a FormData\n *\n * @param {*} thing The value to test\n *\n * @returns {boolean} True if value is an FormData, otherwise false\n */\nconst isFormData = (thing) => {\n let kind;\n return thing && (\n (typeof FormData === 'function' && thing instanceof FormData) || (\n isFunction(thing.append) && (\n (kind = kindOf(thing)) === 'formdata' ||\n // detect form-data instance\n (kind === 'object' && isFunction(thing.toString) && thing.toString() === '[object FormData]')\n )\n )\n )\n}\n\n/**\n * Determine if a value is a URLSearchParams object\n *\n * @param {*} val The value to test\n *\n * @returns {boolean} True if value is a URLSearchParams object, otherwise false\n */\nconst isURLSearchParams = kindOfTest('URLSearchParams');\n\n/**\n * Trim excess whitespace off the beginning and end of a string\n *\n * @param {String} str The String to trim\n *\n * @returns {String} The String freed of excess whitespace\n */\nconst trim = (str) => str.trim ?\n str.trim() : str.replace(/^[\\s\\uFEFF\\xA0]+|[\\s\\uFEFF\\xA0]+$/g, '');\n\n/**\n * Iterate over an Array or an Object invoking a function for each item.\n *\n * If `obj` is an Array callback will be called passing\n * the value, index, and complete array for each item.\n *\n * If 'obj' is an Object callback will be called passing\n * the value, key, and complete object for each property.\n *\n * @param {Object|Array} obj The object to iterate\n * @param {Function} fn The callback to invoke for each item\n *\n * @param {Boolean} [allOwnKeys = false]\n * @returns {any}\n */\nfunction forEach(obj, fn, {allOwnKeys = false} = {}) {\n // Don't bother if no value provided\n if (obj === null || typeof obj === 'undefined') {\n return;\n }\n\n let i;\n let l;\n\n // Force an array if not already something iterable\n if (typeof obj !== 'object') {\n /*eslint no-param-reassign:0*/\n obj = [obj];\n }\n\n if (isArray(obj)) {\n // Iterate over array values\n for (i = 0, l = obj.length; i < l; i++) {\n fn.call(null, obj[i], i, obj);\n }\n } else {\n // Iterate over object keys\n const keys = allOwnKeys ? Object.getOwnPropertyNames(obj) : Object.keys(obj);\n const len = keys.length;\n let key;\n\n for (i = 0; i < len; i++) {\n key = keys[i];\n fn.call(null, obj[key], key, obj);\n }\n }\n}\n\nfunction findKey(obj, key) {\n key = key.toLowerCase();\n const keys = Object.keys(obj);\n let i = keys.length;\n let _key;\n while (i-- > 0) {\n _key = keys[i];\n if (key === _key.toLowerCase()) {\n return _key;\n }\n }\n return null;\n}\n\nconst _global = (() => {\n /*eslint no-undef:0*/\n if (typeof globalThis !== \"undefined\") return globalThis;\n return typeof self !== \"undefined\" ? self : (typeof window !== 'undefined' ? window : global)\n})();\n\nconst isContextDefined = (context) => !isUndefined(context) && context !== _global;\n\n/**\n * Accepts varargs expecting each argument to be an object, then\n * immutably merges the properties of each object and returns result.\n *\n * When multiple objects contain the same key the later object in\n * the arguments list will take precedence.\n *\n * Example:\n *\n * ```js\n * var result = merge({foo: 123}, {foo: 456});\n * console.log(result.foo); // outputs 456\n * ```\n *\n * @param {Object} obj1 Object to merge\n *\n * @returns {Object} Result of all merge properties\n */\nfunction merge(/* obj1, obj2, obj3, ... */) {\n const {caseless} = isContextDefined(this) && this || {};\n const result = {};\n const assignValue = (val, key) => {\n const targetKey = caseless && findKey(result, key) || key;\n if (isPlainObject(result[targetKey]) && isPlainObject(val)) {\n result[targetKey] = merge(result[targetKey], val);\n } else if (isPlainObject(val)) {\n result[targetKey] = merge({}, val);\n } else if (isArray(val)) {\n result[targetKey] = val.slice();\n } else {\n result[targetKey] = val;\n }\n }\n\n for (let i = 0, l = arguments.length; i < l; i++) {\n arguments[i] && forEach(arguments[i], assignValue);\n }\n return result;\n}\n\n/**\n * Extends object a by mutably adding to it the properties of object b.\n *\n * @param {Object} a The object to be extended\n * @param {Object} b The object to copy properties from\n * @param {Object} thisArg The object to bind function to\n *\n * @param {Boolean} [allOwnKeys]\n * @returns {Object} The resulting value of object a\n */\nconst extend = (a, b, thisArg, {allOwnKeys}= {}) => {\n forEach(b, (val, key) => {\n if (thisArg && isFunction(val)) {\n a[key] = bind(val, thisArg);\n } else {\n a[key] = val;\n }\n }, {allOwnKeys});\n return a;\n}\n\n/**\n * Remove byte order marker. This catches EF BB BF (the UTF-8 BOM)\n *\n * @param {string} content with BOM\n *\n * @returns {string} content value without BOM\n */\nconst stripBOM = (content) => {\n if (content.charCodeAt(0) === 0xFEFF) {\n content = content.slice(1);\n }\n return content;\n}\n\n/**\n * Inherit the prototype methods from one constructor into another\n * @param {function} constructor\n * @param {function} superConstructor\n * @param {object} [props]\n * @param {object} [descriptors]\n *\n * @returns {void}\n */\nconst inherits = (constructor, superConstructor, props, descriptors) => {\n constructor.prototype = Object.create(superConstructor.prototype, descriptors);\n constructor.prototype.constructor = constructor;\n Object.defineProperty(constructor, 'super', {\n value: superConstructor.prototype\n });\n props && Object.assign(constructor.prototype, props);\n}\n\n/**\n * Resolve object with deep prototype chain to a flat object\n * @param {Object} sourceObj source object\n * @param {Object} [destObj]\n * @param {Function|Boolean} [filter]\n * @param {Function} [propFilter]\n *\n * @returns {Object}\n */\nconst toFlatObject = (sourceObj, destObj, filter, propFilter) => {\n let props;\n let i;\n let prop;\n const merged = {};\n\n destObj = destObj || {};\n // eslint-disable-next-line no-eq-null,eqeqeq\n if (sourceObj == null) return destObj;\n\n do {\n props = Object.getOwnPropertyNames(sourceObj);\n i = props.length;\n while (i-- > 0) {\n prop = props[i];\n if ((!propFilter || propFilter(prop, sourceObj, destObj)) && !merged[prop]) {\n destObj[prop] = sourceObj[prop];\n merged[prop] = true;\n }\n }\n sourceObj = filter !== false && getPrototypeOf(sourceObj);\n } while (sourceObj && (!filter || filter(sourceObj, destObj)) && sourceObj !== Object.prototype);\n\n return destObj;\n}\n\n/**\n * Determines whether a string ends with the characters of a specified string\n *\n * @param {String} str\n * @param {String} searchString\n * @param {Number} [position= 0]\n *\n * @returns {boolean}\n */\nconst endsWith = (str, searchString, position) => {\n str = String(str);\n if (position === undefined || position > str.length) {\n position = str.length;\n }\n position -= searchString.length;\n const lastIndex = str.indexOf(searchString, position);\n return lastIndex !== -1 && lastIndex === position;\n}\n\n\n/**\n * Returns new array from array like object or null if failed\n *\n * @param {*} [thing]\n *\n * @returns {?Array}\n */\nconst toArray = (thing) => {\n if (!thing) return null;\n if (isArray(thing)) return thing;\n let i = thing.length;\n if (!isNumber(i)) return null;\n const arr = new Array(i);\n while (i-- > 0) {\n arr[i] = thing[i];\n }\n return arr;\n}\n\n/**\n * Checking if the Uint8Array exists and if it does, it returns a function that checks if the\n * thing passed in is an instance of Uint8Array\n *\n * @param {TypedArray}\n *\n * @returns {Array}\n */\n// eslint-disable-next-line func-names\nconst isTypedArray = (TypedArray => {\n // eslint-disable-next-line func-names\n return thing => {\n return TypedArray && thing instanceof TypedArray;\n };\n})(typeof Uint8Array !== 'undefined' && getPrototypeOf(Uint8Array));\n\n/**\n * For each entry in the object, call the function with the key and value.\n *\n * @param {Object
- 
+
-
-
-
+
+
+.png)
+%20(1)%20(1).jpg)
+.jpg)
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
[[Become a sponsor via OpenCollective](https://opencollective.com/Carbon#sponsor)]
+
-
+
[[Become a sponsor via GitHub](https://github.com/sponsors/kylekatarnls)]
diff --git a/vendor/nesbot/carbon/sponsors.php b/vendor/nesbot/carbon/sponsors.php
index 8d607585..41817d68 100644
--- a/vendor/nesbot/carbon/sponsors.php
+++ b/vendor/nesbot/carbon/sponsors.php
@@ -99,8 +99,8 @@ function getOpenCollectiveSponsors(): string
[$x, $y] = @getimagesize($src) ?: [0, 0];
$validImage = ($x && $y);
$src = $validImage ? htmlspecialchars($src) : 'https://opencollective.com/static/images/default-guest-logo.svg';
- $height = $member['status'] === 'sponsor' ? 64 : 48;
- $width = min(128, $validImage ? round($x * $height / $y) : $height);
+ $height = $member['status'] === 'sponsor' ? 64 : 42;
+ $width = min($height * 2, $validImage ? round($x * $height / $y) : $height);
$href .= (strpos($href, '?') === false ? '?' : '&').'utm_source=opencollective&utm_medium=github&utm_campaign=Carbon';
$title = htmlspecialchars(($member['description'] ?? null) ?: $member['name']);
$alt = htmlspecialchars($member['name']);
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/hu.php b/vendor/nesbot/carbon/src/Carbon/Lang/hu.php
index b2d2ac11..b7583eec 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/hu.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/hu.php
@@ -82,7 +82,7 @@ return [
'second_before' => ':count másodperccel',
's_before' => ':count másodperccel',
'months' => ['január', 'február', 'március', 'április', 'május', 'június', 'július', 'augusztus', 'szeptember', 'október', 'november', 'december'],
- 'months_short' => ['jan.', 'feb.', 'márc.', 'ápr.', 'máj.', 'jún.', 'júl.', 'aug.', 'szept.', 'okt.', 'nov.', 'dec.'],
+ 'months_short' => ['jan.', 'febr.', 'márc.', 'ápr.', 'máj.', 'jún.', 'júl.', 'aug.', 'szept.', 'okt.', 'nov.', 'dec.'],
'weekdays' => ['vasárnap', 'hétfő', 'kedd', 'szerda', 'csütörtök', 'péntek', 'szombat'],
'weekdays_short' => ['vas', 'hét', 'kedd', 'sze', 'csüt', 'pén', 'szo'],
'weekdays_min' => ['v', 'h', 'k', 'sze', 'cs', 'p', 'sz'],
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sk.php b/vendor/nesbot/carbon/src/Carbon/Lang/sk.php
index 1c449d74..f9702e96 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/sk.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/sk.php
@@ -147,7 +147,7 @@ return [
'sameElse' => 'L',
],
'weekdays' => ['nedeľa', 'pondelok', 'utorok', 'streda', 'štvrtok', 'piatok', 'sobota'],
- 'weekdays_short' => ['ned', 'pod', 'uto', 'str', 'štv', 'pia', 'sob'],
+ 'weekdays_short' => ['ned', 'pon', 'uto', 'str', 'štv', 'pia', 'sob'],
'weekdays_min' => ['ne', 'po', 'ut', 'st', 'št', 'pi', 'so'],
'months' => ['január', 'február', 'marec', 'apríl', 'máj', 'jún', 'júl', 'august', 'september', 'október', 'november', 'december'],
'months_short' => ['jan', 'feb', 'mar', 'apr', 'máj', 'jún', 'júl', 'aug', 'sep', 'okt', 'nov', 'dec'],
diff --git a/vendor/nette/schema/composer.json b/vendor/nette/schema/composer.json
index 69729eea..626e98f9 100644
--- a/vendor/nette/schema/composer.json
+++ b/vendor/nette/schema/composer.json
@@ -15,12 +15,12 @@
}
],
"require": {
- "php": "7.1 - 8.3",
- "nette/utils": "^2.5.7 || ^3.1.5 || ^4.0"
+ "php": "8.1 - 8.3",
+ "nette/utils": "^4.0"
},
"require-dev": {
- "nette/tester": "^2.3 || ^2.4",
- "tracy/tracy": "^2.7",
+ "nette/tester": "^2.4",
+ "tracy/tracy": "^2.8",
"phpstan/phpstan-nette": "^1.0"
},
"autoload": {
@@ -33,7 +33,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.2-dev"
+ "dev-master": "1.3-dev"
}
}
}
diff --git a/vendor/nette/schema/readme.md b/vendor/nette/schema/readme.md
index 1e6714b5..c88f6bd2 100644
--- a/vendor/nette/schema/readme.md
+++ b/vendor/nette/schema/readme.md
@@ -21,7 +21,7 @@ Installation:
composer require nette/schema
```
-It requires PHP version 7.1 and supports PHP up to 8.3.
+It requires PHP version 8.1 and supports PHP up to 8.3.
[Support Me](https://github.com/sponsors/dg)
@@ -439,7 +439,7 @@ Expect::structure([
// creates '$obj = new Info' and writes to $obj->processRefund and $obj->refundAmount
```
-If the class has a constructor, the elements of the structure are passed as named parameters to the constructor (requires PHP 8):
+If the class has a constructor, the elements of the structure are passed as named parameters to the constructor:
```php
class Info
diff --git a/vendor/nette/schema/src/Schema/Context.php b/vendor/nette/schema/src/Schema/Context.php
index b72c48b4..0f512656 100644
--- a/vendor/nette/schema/src/Schema/Context.php
+++ b/vendor/nette/schema/src/Schema/Context.php
@@ -9,30 +9,24 @@ declare(strict_types=1);
namespace Nette\Schema;
-use Nette;
-
final class Context
{
- use Nette\SmartObject;
-
- /** @var bool */
- public $skipDefaults = false;
+ public bool $skipDefaults = false;
/** @var string[] */
- public $path = [];
+ public array $path = [];
- /** @var bool */
- public $isKey = false;
+ public bool $isKey = false;
/** @var Message[] */
- public $errors = [];
+ public array $errors = [];
/** @var Message[] */
- public $warnings = [];
+ public array $warnings = [];
/** @var array[] */
- public $dynamics = [];
+ public array $dynamics = [];
public function addError(string $message, string $code, array $variables = []): Message
@@ -52,8 +46,6 @@ final class Context
public function createChecker(): \Closure
{
$count = count($this->errors);
- return function () use ($count): bool {
- return $count === count($this->errors);
- };
+ return fn(): bool => $count === count($this->errors);
}
}
diff --git a/vendor/nette/schema/src/Schema/Elements/AnyOf.php b/vendor/nette/schema/src/Schema/Elements/AnyOf.php
index 446d6ff5..6c9d0cea 100644
--- a/vendor/nette/schema/src/Schema/Elements/AnyOf.php
+++ b/vendor/nette/schema/src/Schema/Elements/AnyOf.php
@@ -18,16 +18,11 @@ use Nette\Schema\Schema;
final class AnyOf implements Schema
{
use Base;
- use Nette\SmartObject;
- /** @var array */
- private $set;
+ private array $set;
- /**
- * @param mixed|Schema ...$set
- */
- public function __construct(...$set)
+ public function __construct(mixed ...$set)
{
if (!$set) {
throw new Nette\InvalidStateException('The enumeration must not be empty.');
@@ -61,13 +56,13 @@ final class AnyOf implements Schema
/********************* processing ****************d*g**/
- public function normalize($value, Context $context)
+ public function normalize(mixed $value, Context $context): mixed
{
return $this->doNormalize($value, $context);
}
- public function merge($value, $base)
+ public function merge(mixed $value, mixed $base): mixed
{
if (is_array($value) && isset($value[Helpers::PreventMerging])) {
unset($value[Helpers::PreventMerging]);
@@ -78,7 +73,7 @@ final class AnyOf implements Schema
}
- public function complete($value, Context $context)
+ public function complete(mixed $value, Context $context): mixed
{
$isOk = $context->createChecker();
$value = $this->findAlternative($value, $context);
@@ -87,7 +82,7 @@ final class AnyOf implements Schema
}
- private function findAlternative($value, Context $context)
+ private function findAlternative(mixed $value, Context $context): mixed
{
$expecteds = $innerErrors = [];
foreach ($this->set as $item) {
@@ -125,18 +120,20 @@ final class AnyOf implements Schema
[
'value' => $value,
'expected' => implode('|', array_unique($expecteds)),
- ]
+ ],
);
}
+
+ return null;
}
- public function completeDefault(Context $context)
+ public function completeDefault(Context $context): mixed
{
if ($this->required) {
$context->addError(
'The mandatory item %path% is missing.',
- Nette\Schema\Message::MissingItem
+ Nette\Schema\Message::MissingItem,
);
return null;
}
diff --git a/vendor/nette/schema/src/Schema/Elements/Base.php b/vendor/nette/schema/src/Schema/Elements/Base.php
index 4b445147..1dfda8a2 100644
--- a/vendor/nette/schema/src/Schema/Elements/Base.php
+++ b/vendor/nette/schema/src/Schema/Elements/Base.php
@@ -19,23 +19,18 @@ use Nette\Schema\Helpers;
*/
trait Base
{
- /** @var bool */
- private $required = false;
+ private bool $required = false;
+ private mixed $default = null;
- /** @var mixed */
- private $default;
-
- /** @var callable|null */
+ /** @var ?callable */
private $before;
/** @var callable[] */
- private $transforms = [];
-
- /** @var string|null */
- private $deprecated;
+ private array $transforms = [];
+ private ?string $deprecated = null;
- public function default($value): self
+ public function default(mixed $value): self
{
$this->default = $value;
return $this;
@@ -79,7 +74,7 @@ trait Base
$context->addError(
'Failed assertion ' . ($description ? "'%assertion%'" : '%assertion%') . ' for %label% %path% with value %value%.',
Nette\Schema\Message::FailedAssertion,
- ['value' => $value, 'assertion' => $expected]
+ ['value' => $value, 'assertion' => $expected],
);
});
}
@@ -93,12 +88,12 @@ trait Base
}
- public function completeDefault(Context $context)
+ public function completeDefault(Context $context): mixed
{
if ($this->required) {
$context->addError(
'The mandatory item %path% is missing.',
- Nette\Schema\Message::MissingItem
+ Nette\Schema\Message::MissingItem,
);
return null;
}
@@ -107,7 +102,7 @@ trait Base
}
- public function doNormalize($value, Context $context)
+ public function doNormalize(mixed $value, Context $context): mixed
{
if ($this->before) {
$value = ($this->before)($value);
@@ -122,13 +117,13 @@ trait Base
if ($this->deprecated !== null) {
$context->addWarning(
$this->deprecated,
- Nette\Schema\Message::Deprecated
+ Nette\Schema\Message::Deprecated,
);
}
}
- private function doTransform($value, Context $context)
+ private function doTransform(mixed $value, Context $context): mixed
{
$isOk = $context->createChecker();
foreach ($this->transforms as $handler) {
@@ -142,7 +137,7 @@ trait Base
/** @deprecated use Nette\Schema\Validators::validateType() */
- private function doValidate($value, string $expected, Context $context): bool
+ private function doValidate(mixed $value, string $expected, Context $context): bool
{
$isOk = $context->createChecker();
Helpers::validateType($value, $expected, $context);
@@ -151,7 +146,7 @@ trait Base
/** @deprecated use Nette\Schema\Validators::validateRange() */
- private static function doValidateRange($value, array $range, Context $context, string $types = ''): bool
+ private static function doValidateRange(mixed $value, array $range, Context $context, string $types = ''): bool
{
$isOk = $context->createChecker();
Helpers::validateRange($value, $range, $context, $types);
@@ -160,7 +155,7 @@ trait Base
/** @deprecated use doTransform() */
- private function doFinalize($value, Context $context)
+ private function doFinalize(mixed $value, Context $context): mixed
{
return $this->doTransform($value, $context);
}
diff --git a/vendor/nette/schema/src/Schema/Elements/Structure.php b/vendor/nette/schema/src/Schema/Elements/Structure.php
index 02ca77b4..56f5ffe8 100644
--- a/vendor/nette/schema/src/Schema/Elements/Structure.php
+++ b/vendor/nette/schema/src/Schema/Elements/Structure.php
@@ -18,19 +18,16 @@ use Nette\Schema\Schema;
final class Structure implements Schema
{
use Base;
- use Nette\SmartObject;
/** @var Schema[] */
- private $items;
+ private array $items;
- /** @var Schema|null for array|list */
- private $otherItems;
+ /** for array|list */
+ private ?Schema $otherItems = null;
/** @var array{?int, ?int} */
- private $range = [null, null];
-
- /** @var bool */
- private $skipDefaults = false;
+ private array $range = [null, null];
+ private bool $skipDefaults = false;
/**
@@ -45,7 +42,7 @@ final class Structure implements Schema
}
- public function default($value): self
+ public function default(mixed $value): self
{
throw new Nette\InvalidStateException('Structure cannot have default value.');
}
@@ -65,10 +62,7 @@ final class Structure implements Schema
}
- /**
- * @param string|Schema $type
- */
- public function otherItems($type = 'mixed'): self
+ public function otherItems(string|Schema $type = 'mixed'): self
{
$this->otherItems = $type instanceof Schema ? $type : new Type($type);
return $this;
@@ -85,7 +79,7 @@ final class Structure implements Schema
/********************* processing ****************d*g**/
- public function normalize($value, Context $context)
+ public function normalize(mixed $value, Context $context): mixed
{
if ($prevent = (is_array($value) && isset($value[Helpers::PreventMerging]))) {
unset($value[Helpers::PreventMerging]);
@@ -115,7 +109,7 @@ final class Structure implements Schema
}
- public function merge($value, $base)
+ public function merge(mixed $value, mixed $base): mixed
{
if (is_array($value) && isset($value[Helpers::PreventMerging])) {
unset($value[Helpers::PreventMerging]);
@@ -145,7 +139,7 @@ final class Structure implements Schema
}
- public function complete($value, Context $context)
+ public function complete(mixed $value, Context $context): mixed
{
if ($value === null) {
$value = []; // is unable to distinguish null from array in NEON
@@ -171,11 +165,11 @@ final class Structure implements Schema
} else {
$keys = array_map('strval', array_keys($items));
foreach ($extraKeys as $key) {
- $hint = Nette\Utils\ObjectHelpers::getSuggestion($keys, (string) $key);
+ $hint = Nette\Utils\Helpers::getSuggestion($keys, (string) $key);
$context->addError(
'Unexpected item %path%' . ($hint ? ", did you mean '%hint%'?" : '.'),
Nette\Schema\Message::UnexpectedItem,
- ['hint' => $hint]
+ ['hint' => $hint],
)->path[] = $key;
}
}
@@ -197,7 +191,7 @@ final class Structure implements Schema
}
- public function completeDefault(Context $context)
+ public function completeDefault(Context $context): mixed
{
return $this->required
? $this->complete([], $context)
diff --git a/vendor/nette/schema/src/Schema/Elements/Type.php b/vendor/nette/schema/src/Schema/Elements/Type.php
index c953c6ad..4094442e 100644
--- a/vendor/nette/schema/src/Schema/Elements/Type.php
+++ b/vendor/nette/schema/src/Schema/Elements/Type.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
namespace Nette\Schema\Elements;
-use Nette;
use Nette\Schema\Context;
use Nette\Schema\DynamicParameter;
use Nette\Schema\Helpers;
@@ -19,25 +18,15 @@ use Nette\Schema\Schema;
final class Type implements Schema
{
use Base;
- use Nette\SmartObject;
- /** @var string */
- private $type;
-
- /** @var Schema|null for arrays */
- private $itemsValue;
-
- /** @var Schema|null for arrays */
- private $itemsKey;
+ private string $type;
+ private ?Schema $itemsValue = null;
+ private ?Schema $itemsKey = null;
/** @var array{?float, ?float} */
- private $range = [null, null];
-
- /** @var string|null */
- private $pattern;
-
- /** @var bool */
- private $merge = true;
+ private array $range = [null, null];
+ private ?string $pattern = null;
+ private bool $merge = true;
public function __construct(string $type)
@@ -84,11 +73,9 @@ final class Type implements Schema
/**
- * @param string|Schema $valueType
- * @param string|Schema|null $keyType
* @internal use arrayOf() or listOf()
*/
- public function items($valueType = 'mixed', $keyType = null): self
+ public function items(string|Schema $valueType = 'mixed', string|Schema $keyType = null): self
{
$this->itemsValue = $valueType instanceof Schema
? $valueType
@@ -110,7 +97,7 @@ final class Type implements Schema
/********************* processing ****************d*g**/
- public function normalize($value, Context $context)
+ public function normalize(mixed $value, Context $context): mixed
{
if ($prevent = (is_array($value) && isset($value[Helpers::PreventMerging]))) {
unset($value[Helpers::PreventMerging]);
@@ -141,7 +128,7 @@ final class Type implements Schema
}
- public function merge($value, $base)
+ public function merge(mixed $value, mixed $base): mixed
{
if (is_array($value) && isset($value[Helpers::PreventMerging])) {
unset($value[Helpers::PreventMerging]);
@@ -168,7 +155,7 @@ final class Type implements Schema
}
- public function complete($value, Context $context)
+ public function complete(mixed $value, Context $context): mixed
{
$merge = $this->merge;
if (is_array($value) && isset($value[Helpers::PreventMerging])) {
diff --git a/vendor/nette/schema/src/Schema/Expect.php b/vendor/nette/schema/src/Schema/Expect.php
index f2999502..38f1c81f 100644
--- a/vendor/nette/schema/src/Schema/Expect.php
+++ b/vendor/nette/schema/src/Schema/Expect.php
@@ -32,8 +32,6 @@ use Nette\Schema\Elements\Type;
*/
final class Expect
{
- use Nette\SmartObject;
-
public static function __callStatic(string $name, array $args): Type
{
$type = new Type($name);
@@ -51,10 +49,7 @@ final class Expect
}
- /**
- * @param mixed|Schema ...$set
- */
- public static function anyOf(...$set): AnyOf
+ public static function anyOf(mixed ...$set): AnyOf
{
return new AnyOf(...$set);
}
@@ -69,21 +64,20 @@ final class Expect
}
- /**
- * @param object $object
- */
- public static function from($object, array $items = []): Structure
+ public static function from(object $object, array $items = []): Structure
{
$ro = new \ReflectionObject($object);
- foreach ($ro->getProperties() as $prop) {
- $type = Helpers::getPropertyType($prop) ?? 'mixed';
+ $props = $ro->hasMethod('__construct')
+ ? $ro->getMethod('__construct')->getParameters()
+ : $ro->getProperties();
+
+ foreach ($props as $prop) {
$item = &$items[$prop->getName()];
if (!$item) {
+ $type = Helpers::getPropertyType($prop) ?? 'mixed';
$item = new Type($type);
- if (PHP_VERSION_ID >= 70400 && !$prop->isInitialized($object)) {
- $item->required();
- } else {
- $def = $prop->getValue($object);
+ if ($prop instanceof \ReflectionProperty ? $prop->isInitialized($object) : $prop->isOptional()) {
+ $def = ($prop instanceof \ReflectionProperty ? $prop->getValue($object) : $prop->getDefaultValue());
if (is_object($def)) {
$item = static::from($def);
} elseif ($def === null && !Nette\Utils\Validators::is(null, $type)) {
@@ -91,6 +85,8 @@ final class Expect
} else {
$item->default($def);
}
+ } else {
+ $item->required();
}
}
}
@@ -99,20 +95,13 @@ final class Expect
}
- /**
- * @param string|Schema $valueType
- * @param string|Schema|null $keyType
- */
- public static function arrayOf($valueType, $keyType = null): Type
+ public static function arrayOf(string|Schema $valueType, string|Schema $keyType = null): Type
{
return (new Type('array'))->items($valueType, $keyType);
}
- /**
- * @param string|Schema $type
- */
- public static function listOf($type): Type
+ public static function listOf(string|Schema $type): Type
{
return (new Type('list'))->items($type);
}
diff --git a/vendor/nette/schema/src/Schema/Helpers.php b/vendor/nette/schema/src/Schema/Helpers.php
index 3b653221..70bf1836 100644
--- a/vendor/nette/schema/src/Schema/Helpers.php
+++ b/vendor/nette/schema/src/Schema/Helpers.php
@@ -21,14 +21,12 @@ final class Helpers
use Nette\StaticClass;
public const PreventMerging = '_prevent_merging';
- public const PREVENT_MERGING = self::PreventMerging;
/**
* Merges dataset. Left has higher priority than right one.
- * @return array|string
*/
- public static function merge($value, $base)
+ public static function merge(mixed $value, mixed $base): mixed
{
if (is_array($value) && isset($value[self::PreventMerging])) {
unset($value[self::PreventMerging]);
@@ -57,17 +55,16 @@ final class Helpers
}
- public static function getPropertyType(\ReflectionProperty $prop): ?string
+ public static function getPropertyType(\ReflectionProperty|\ReflectionParameter $prop): ?string
{
- if (!class_exists(Nette\Utils\Type::class)) {
- throw new Nette\NotSupportedException('Expect::from() requires nette/utils 3.x');
- } elseif ($type = Nette\Utils\Type::fromReflection($prop)) {
+ if ($type = Nette\Utils\Type::fromReflection($prop)) {
return (string) $type;
- } elseif ($type = preg_replace('#\s.*#', '', (string) self::parseAnnotation($prop, 'var'))) {
+ } elseif (
+ ($prop instanceof \ReflectionProperty)
+ && ($type = preg_replace('#\s.*#', '', (string) self::parseAnnotation($prop, 'var')))
+ ) {
$class = Reflection::getPropertyDeclaringClass($prop);
- return preg_replace_callback('#[\w\\\\]+#', function ($m) use ($class) {
- return Reflection::expandClassName($m[0], $class);
- }, $type);
+ return preg_replace_callback('#[\w\\\\]+#', fn($m) => Reflection::expandClassName($m[0], $class), $type);
}
return null;
@@ -93,24 +90,23 @@ final class Helpers
}
- /**
- * @param mixed $value
- */
- public static function formatValue($value): string
+ public static function formatValue(mixed $value): string
{
- if (is_object($value)) {
- return 'object ' . get_class($value);
+ if ($value instanceof DynamicParameter) {
+ return 'dynamic';
+ } elseif (is_object($value)) {
+ return 'object ' . $value::class;
} elseif (is_string($value)) {
return "'" . Nette\Utils\Strings::truncate($value, 15, '...') . "'";
} elseif (is_scalar($value)) {
- return var_export($value, true);
+ return var_export($value, return: true);
} else {
- return strtolower(gettype($value));
+ return get_debug_type($value);
}
}
- public static function validateType($value, string $expected, Context $context): void
+ public static function validateType(mixed $value, string $expected, Context $context): void
{
if (!Nette\Utils\Validators::is($value, $expected)) {
$expected = str_replace(DynamicParameter::class . '|', '', $expected);
@@ -118,13 +114,13 @@ final class Helpers
$context->addError(
'The %label% %path% expects to be %expected%, %value% given.',
Message::TypeMismatch,
- ['value' => $value, 'expected' => $expected]
+ ['value' => $value, 'expected' => $expected],
);
}
}
- public static function validateRange($value, array $range, Context $context, string $types = ''): void
+ public static function validateRange(mixed $value, array $range, Context $context, string $types = ''): void
{
if (is_array($value) || is_string($value)) {
[$length, $label] = is_array($value)
@@ -137,20 +133,20 @@ final class Helpers
$context->addError(
"The length of %label% %path% expects to be in range %expected%, %length% $label given.",
Message::LengthOutOfRange,
- ['value' => $value, 'length' => $length, 'expected' => implode('..', $range)]
+ ['value' => $value, 'length' => $length, 'expected' => implode('..', $range)],
);
}
} elseif ((is_int($value) || is_float($value)) && !self::isInRange($value, $range)) {
$context->addError(
'The %label% %path% expects to be in range %expected%, %value% given.',
Message::ValueOutOfRange,
- ['value' => $value, 'expected' => implode('..', $range)]
+ ['value' => $value, 'expected' => implode('..', $range)],
);
}
}
- public static function isInRange($value, array $range): bool
+ public static function isInRange(mixed $value, array $range): bool
{
return ($range[0] === null || $value >= $range[0])
&& ($range[1] === null || $value <= $range[1]);
@@ -163,7 +159,7 @@ final class Helpers
$context->addError(
"The %label% %path% expects to match pattern '%pattern%', %value% given.",
Message::PatternMismatch,
- ['value' => $value, 'pattern' => $pattern]
+ ['value' => $value, 'pattern' => $pattern],
);
}
}
@@ -177,22 +173,11 @@ final class Helpers
return $value;
};
} elseif (method_exists($type, '__construct')) {
- return static function ($value) use ($type) {
- if (PHP_VERSION_ID < 80000 && is_array($value)) {
- throw new Nette\NotSupportedException("Creating $type objects is supported since PHP 8.0");
- }
- return is_array($value)
- ? new $type(...$value)
- : new $type($value);
- };
+ return static fn($value) => is_array($value) || $value instanceof \stdClass
+ ? new $type(...(array) $value)
+ : new $type($value);
} else {
- return static function ($value) use ($type) {
- $object = new $type;
- foreach ($value as $k => $v) {
- $object->$k = $v;
- }
- return $object;
- };
+ return static fn($value) => Nette\Utils\Arrays::toObject((array) $value, new $type);
}
}
}
diff --git a/vendor/nette/schema/src/Schema/Message.php b/vendor/nette/schema/src/Schema/Message.php
index 6f7c2ecc..4e976d03 100644
--- a/vendor/nette/schema/src/Schema/Message.php
+++ b/vendor/nette/schema/src/Schema/Message.php
@@ -14,8 +14,6 @@ use Nette;
final class Message
{
- use Nette\SmartObject;
-
/** variables: {value: mixed, expected: string} */
public const TypeMismatch = 'schema.typeMismatch';
@@ -40,27 +38,38 @@ final class Message
/** no variables */
public const Deprecated = 'schema.deprecated';
- /** Deprecated */
+ /** @deprecated use Message::TypeMismatch */
public const TYPE_MISMATCH = self::TypeMismatch;
+
+ /** @deprecated use Message::ValueOutOfRange */
public const VALUE_OUT_OF_RANGE = self::ValueOutOfRange;
+
+ /** @deprecated use Message::LengthOutOfRange */
public const LENGTH_OUT_OF_RANGE = self::LengthOutOfRange;
+
+ /** @deprecated use Message::PatternMismatch */
public const PATTERN_MISMATCH = self::PatternMismatch;
+
+ /** @deprecated use Message::FailedAssertion */
public const FAILED_ASSERTION = self::FailedAssertion;
+
+ /** @deprecated use Message::MissingItem */
public const MISSING_ITEM = self::MissingItem;
+
+ /** @deprecated use Message::UnexpectedItem */
public const UNEXPECTED_ITEM = self::UnexpectedItem;
+
+ /** @deprecated use Message::Deprecated */
public const DEPRECATED = self::Deprecated;
- /** @var string */
- public $message;
-
- /** @var string */
- public $code;
+ public string $message;
+ public string $code;
/** @var string[] */
- public $path;
+ public array $path;
/** @var string[] */
- public $variables;
+ public array $variables;
public function __construct(string $message, string $code, array $path, array $variables = [])
@@ -84,6 +93,6 @@ final class Message
return preg_replace_callback('~( ?)%(\w+)%~', function ($m) use ($vars) {
[, $space, $key] = $m;
return $vars[$key] === null ? '' : $space . $vars[$key];
- }, $this->message);
+ }, $this->message) ?? throw new Nette\InvalidStateException(preg_last_error_msg());
}
}
diff --git a/vendor/nette/schema/src/Schema/Processor.php b/vendor/nette/schema/src/Schema/Processor.php
index a10a0ef6..3290ba60 100644
--- a/vendor/nette/schema/src/Schema/Processor.php
+++ b/vendor/nette/schema/src/Schema/Processor.php
@@ -17,19 +17,12 @@ use Nette;
*/
final class Processor
{
- use Nette\SmartObject;
-
- /** @var array */
- public $onNewContext = [];
-
- /** @var Context|null */
- private $context;
-
- /** @var bool */
- private $skipDefaults;
+ public array $onNewContext = [];
+ private Context $context;
+ private bool $skipDefaults = false;
- public function skipDefaults(bool $value = true)
+ public function skipDefaults(bool $value = true): void
{
$this->skipDefaults = $value;
}
@@ -37,10 +30,9 @@ final class Processor
/**
* Normalizes and validates data. Result is a clean completed data.
- * @return mixed
* @throws ValidationException
*/
- public function process(Schema $schema, $data)
+ public function process(Schema $schema, mixed $data): mixed
{
$this->createContext();
$data = $schema->normalize($data, $this->context);
@@ -53,10 +45,9 @@ final class Processor
/**
* Normalizes and validates and merges multiple data. Result is a clean completed data.
- * @return mixed
* @throws ValidationException
*/
- public function processMultiple(Schema $schema, array $dataset)
+ public function processMultiple(Schema $schema, array $dataset): mixed
{
$this->createContext();
$flatten = null;
@@ -96,10 +87,10 @@ final class Processor
}
- private function createContext()
+ private function createContext(): void
{
$this->context = new Context;
$this->context->skipDefaults = $this->skipDefaults;
- $this->onNewContext($this->context);
+ Nette\Utils\Arrays::invoke($this->onNewContext, $this->context);
}
}
diff --git a/vendor/nette/schema/src/Schema/Schema.php b/vendor/nette/schema/src/Schema/Schema.php
index bbd8bd09..3ded7698 100644
--- a/vendor/nette/schema/src/Schema/Schema.php
+++ b/vendor/nette/schema/src/Schema/Schema.php
@@ -16,19 +16,19 @@ interface Schema
* Normalization.
* @return mixed
*/
- function normalize($value, Context $context);
+ function normalize(mixed $value, Context $context);
/**
* Merging.
* @return mixed
*/
- function merge($value, $base);
+ function merge(mixed $value, mixed $base);
/**
* Validation and finalization.
* @return mixed
*/
- function complete($value, Context $context);
+ function complete(mixed $value, Context $context);
/**
* @return mixed
diff --git a/vendor/nette/schema/src/Schema/ValidationException.php b/vendor/nette/schema/src/Schema/ValidationException.php
index 04c581f9..caae0be4 100644
--- a/vendor/nette/schema/src/Schema/ValidationException.php
+++ b/vendor/nette/schema/src/Schema/ValidationException.php
@@ -18,7 +18,7 @@ use Nette;
class ValidationException extends Nette\InvalidStateException
{
/** @var Message[] */
- private $messages;
+ private array $messages;
/**
diff --git a/vendor/phpunit/phpunit/ChangeLog-10.5.md b/vendor/phpunit/phpunit/ChangeLog-10.5.md
index 067699db..a71f09ac 100644
--- a/vendor/phpunit/phpunit/ChangeLog-10.5.md
+++ b/vendor/phpunit/phpunit/ChangeLog-10.5.md
@@ -2,6 +2,12 @@
All notable changes of the PHPUnit 10.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
+## [10.5.9] - 2024-01-22
+
+### Fixed
+
+* [#5676](https://github.com/sebastianbergmann/phpunit/issues/5676): PHPUnit's test runner overwrites custom error handler registered using `set_error_handler()` in bootstrap script
+
## [10.5.8] - 2024-01-19
### Fixed
@@ -91,6 +97,7 @@ All notable changes of the PHPUnit 10.5 release series are documented in this fi
* [#5563](https://github.com/sebastianbergmann/phpunit/issues/5563): `createMockForIntersectionOfInterfaces()` does not automatically register mock object for expectation verification
+[10.5.9]: https://github.com/sebastianbergmann/phpunit/compare/10.5.8...10.5.9
[10.5.8]: https://github.com/sebastianbergmann/phpunit/compare/10.5.7...10.5.8
[10.5.7]: https://github.com/sebastianbergmann/phpunit/compare/10.5.6...10.5.7
[10.5.6]: https://github.com/sebastianbergmann/phpunit/compare/10.5.5...10.5.6
diff --git a/vendor/phpunit/phpunit/src/Runner/ErrorHandler.php b/vendor/phpunit/phpunit/src/Runner/ErrorHandler.php
index ea3acfa5..e1c5b8a7 100644
--- a/vendor/phpunit/phpunit/src/Runner/ErrorHandler.php
+++ b/vendor/phpunit/phpunit/src/Runner/ErrorHandler.php
@@ -166,7 +166,13 @@ final class ErrorHandler
return;
}
- set_error_handler($this);
+ $oldErrorHandler = set_error_handler($this);
+
+ if ($oldErrorHandler !== null) {
+ restore_error_handler();
+
+ return;
+ }
$this->enabled = true;
$this->originalErrorReportingLevel = error_reporting();
diff --git a/vendor/phpunit/phpunit/src/Runner/Version.php b/vendor/phpunit/phpunit/src/Runner/Version.php
index c93a7b7d..59ddf150 100644
--- a/vendor/phpunit/phpunit/src/Runner/Version.php
+++ b/vendor/phpunit/phpunit/src/Runner/Version.php
@@ -34,7 +34,7 @@ final class Version
}
if (self::$version === '') {
- self::$version = (new VersionId('10.5.8', dirname(__DIR__, 2)))->asString();
+ self::$version = (new VersionId('10.5.9', dirname(__DIR__, 2)))->asString();
}
return self::$version;
diff --git a/vendor/phpunit/phpunit/src/TextUI/Help.php b/vendor/phpunit/phpunit/src/TextUI/Help.php
index e09c172b..4eb638b1 100644
--- a/vendor/phpunit/phpunit/src/TextUI/Help.php
+++ b/vendor/phpunit/phpunit/src/TextUI/Help.php
@@ -11,6 +11,7 @@ namespace PHPUnit\TextUI;
use const PHP_EOL;
use function count;
+use function defined;
use function explode;
use function max;
use function preg_replace_callback;
@@ -26,144 +27,7 @@ use SebastianBergmann\Environment\Console;
*/
final class Help
{
- private const LEFT_MARGIN = ' ';
- private const HELP_TEXT = [
- 'Usage' => [
- ['text' => 'phpunit [options] ...'],
- ],
-
- 'Configuration' => [
- ['arg' => '--bootstrap ', 'desc' => 'A PHP script that is included before the tests run'],
- ['arg' => '-c|--configuration ', 'desc' => 'Read configuration from XML file'],
- ['arg' => '--no-configuration', 'desc' => 'Ignore default configuration file (phpunit.xml)'],
- ['arg' => '--no-extensions', 'desc' => 'Do not load PHPUnit extensions'],
- ['arg' => '--include-path ', 'desc' => 'Prepend PHP\'s include_path with given path(s)'],
- ['arg' => '-d ', 'desc' => 'Sets a php.ini value'],
- ['arg' => '--cache-directory ', 'desc' => 'Specify cache directory'],
- ['arg' => '--generate-configuration', 'desc' => 'Generate configuration file with suggested settings'],
- ['arg' => '--migrate-configuration', 'desc' => 'Migrate configuration file to current format'],
- ['arg' => '--generate-baseline ', 'desc' => 'Generate baseline for issues'],
- ['arg' => '--use-baseline ', 'desc' => 'Use baseline to ignore issues'],
- ['arg' => '--ignore-baseline', 'desc' => 'Do not use baseline to ignore issues'],
- ],
-
- 'Selection' => [
- ['arg' => '--list-suites', 'desc' => 'List available test suites'],
- ['arg' => '--testsuite ', 'desc' => 'Only run tests from the specified test suite(s)'],
- ['arg' => '--exclude-testsuite ', 'desc' => 'Exclude tests from the specified test suite(s)'],
- ['arg' => '--list-groups', 'desc' => 'List available test groups'],
- ['arg' => '--group ', 'desc' => 'Only run tests from the specified group(s)'],
- ['arg' => '--exclude-group ', 'desc' => 'Exclude tests from the specified group(s)'],
- ['arg' => '--covers ', 'desc' => 'Only run tests that intend to cover '],
- ['arg' => '--uses ', 'desc' => 'Only run tests that intend to use '],
- ['arg' => '--list-tests', 'desc' => 'List available tests'],
- ['arg' => '--list-tests-xml ', 'desc' => 'List available tests in XML format'],
- ['arg' => '--filter ', 'desc' => 'Filter which tests to run'],
- ['arg' => '--test-suffix ', 'desc' => 'Only search for test in files with specified suffix(es). Default: Test.php,.phpt'],
- ],
-
- 'Execution' => [
- ['arg' => '--process-isolation', 'desc' => 'Run each test in a separate PHP process'],
- ['arg' => '--globals-backup', 'desc' => 'Backup and restore $GLOBALS for each test'],
- ['arg' => '--static-backup', 'desc' => 'Backup and restore static properties for each test'],
- ['spacer' => ''],
-
- ['arg' => '--strict-coverage', 'desc' => 'Be strict about code coverage metadata'],
- ['arg' => '--strict-global-state', 'desc' => 'Be strict about changes to global state'],
- ['arg' => '--disallow-test-output', 'desc' => 'Be strict about output during tests'],
- ['arg' => '--enforce-time-limit', 'desc' => 'Enforce time limit based on test size'],
- ['arg' => '--default-time-limit ', 'desc' => 'Timeout in seconds for tests that have no declared size'],
- ['arg' => '--dont-report-useless-tests', 'desc' => 'Do not report tests that do not test anything'],
- ['spacer' => ''],
-
- ['arg' => '--stop-on-defect', 'desc' => 'Stop after first error, failure, warning, or risky test'],
- ['arg' => '--stop-on-error', 'desc' => 'Stop after first error'],
- ['arg' => '--stop-on-failure', 'desc' => 'Stop after first failure'],
- ['arg' => '--stop-on-warning', 'desc' => 'Stop after first warning'],
- ['arg' => '--stop-on-risky', 'desc' => 'Stop after first risky test'],
- ['arg' => '--stop-on-deprecation', 'desc' => 'Stop after first test that triggered a deprecation'],
- ['arg' => '--stop-on-notice', 'desc' => 'Stop after first test that triggered a notice'],
- ['arg' => '--stop-on-skipped', 'desc' => 'Stop after first skipped test'],
- ['arg' => '--stop-on-incomplete', 'desc' => 'Stop after first incomplete test'],
- ['spacer' => ''],
-
- ['arg' => '--fail-on-warning', 'desc' => 'Signal failure using shell exit code when a warning was triggered'],
- ['arg' => '--fail-on-risky', 'desc' => 'Signal failure using shell exit code when a test was considered risky'],
- ['arg' => '--fail-on-deprecation', 'desc' => 'Signal failure using shell exit code when a deprecation was triggered'],
- ['arg' => '--fail-on-notice', 'desc' => 'Signal failure using shell exit code when a notice was triggered'],
- ['arg' => '--fail-on-skipped', 'desc' => 'Signal failure using shell exit code when a test was skipped'],
- ['arg' => '--fail-on-incomplete', 'desc' => 'Signal failure using shell exit code when a test was marked incomplete'],
- ['spacer' => ''],
-
- ['arg' => '--cache-result', 'desc' => 'Write test results to cache file'],
- ['arg' => '--do-not-cache-result', 'desc' => 'Do not write test results to cache file'],
- ['spacer' => ''],
-
- ['arg' => '--order-by ', 'desc' => 'Run tests in order: default|defects|depends|duration|no-depends|random|reverse|size'],
- ['arg' => '--random-order-seed ', 'desc' => 'Use the specified random seed when running tests in random order'],
- ],
-
- 'Reporting' => [
- ['arg' => '--colors
Welcome to {{ $page.props.appName }}
-Please, login in to begin
+
+
-
-
diff --git a/resources/js/app.js b/resources/js/app.js
index 47e5dfd3..461eca07 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -1,5 +1,6 @@
import "./bootstrap";
import "../css/app.css";
+import "../css/bootstrap.css";
import { createApp, h } from "vue";
import { createInertiaApp } from "@inertiajs/inertia-vue3";
@@ -19,4 +20,17 @@ createInertiaApp({
.use(plugin)
.mount(el);
},
+ progress: {
+ // The delay after which the progress bar will appear, in milliseconds...
+ delay: 250,
+
+ // The color of the progress bar...
+ color: '#29d',
+
+ // Whether to include the default NProgress styles...
+ includeCSS: true,
+
+ // Whether the NProgress spinner will be shown...
+ showSpinner: false,
+ },
});
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 9a966be4..4c999afc 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,5 +1,7 @@
name('login');
+Route::post('/login', [UserController::class, 'login']);
+Route::middleware(['auth'])->group(function(){
+ Route::get('/', function () {
+ return view('welcome');
+ })->name('home');
+
});
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 52e63a75..62cdbc4a 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -9,6 +9,7 @@ return array(
'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php',
'App\\Exceptions\\Handler' => $baseDir . '/app/Exceptions/Handler.php',
'App\\Http\\Controllers\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php',
+ 'App\\Http\\Controllers\\UserController' => $baseDir . '/app/Http/Controllers/UserController.php',
'App\\Http\\Kernel' => $baseDir . '/app/Http/Kernel.php',
'App\\Http\\Middleware\\Authenticate' => $baseDir . '/app/Http/Middleware/Authenticate.php',
'App\\Http\\Middleware\\EncryptCookies' => $baseDir . '/app/Http/Middleware/EncryptCookies.php',
@@ -1896,6 +1897,7 @@ return array(
'Illuminate\\Queue\\Events\\JobProcessed' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/Events/JobProcessed.php',
'Illuminate\\Queue\\Events\\JobProcessing' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/Events/JobProcessing.php',
'Illuminate\\Queue\\Events\\JobQueued' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/Events/JobQueued.php',
+ 'Illuminate\\Queue\\Events\\JobQueueing' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/Events/JobQueueing.php',
'Illuminate\\Queue\\Events\\JobReleasedAfterException' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/Events/JobReleasedAfterException.php',
'Illuminate\\Queue\\Events\\JobRetryRequested' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/Events/JobRetryRequested.php',
'Illuminate\\Queue\\Events\\JobTimedOut' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/Events/JobTimedOut.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 86aa25ba..b4ed59c1 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -538,6 +538,7 @@ class ComposerStaticInitc055060de071b17f9341a87ba18bf477
'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php',
'App\\Exceptions\\Handler' => __DIR__ . '/../..' . '/app/Exceptions/Handler.php',
'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php',
+ 'App\\Http\\Controllers\\UserController' => __DIR__ . '/../..' . '/app/Http/Controllers/UserController.php',
'App\\Http\\Kernel' => __DIR__ . '/../..' . '/app/Http/Kernel.php',
'App\\Http\\Middleware\\Authenticate' => __DIR__ . '/../..' . '/app/Http/Middleware/Authenticate.php',
'App\\Http\\Middleware\\EncryptCookies' => __DIR__ . '/../..' . '/app/Http/Middleware/EncryptCookies.php',
@@ -2425,6 +2426,7 @@ class ComposerStaticInitc055060de071b17f9341a87ba18bf477
'Illuminate\\Queue\\Events\\JobProcessed' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Events/JobProcessed.php',
'Illuminate\\Queue\\Events\\JobProcessing' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Events/JobProcessing.php',
'Illuminate\\Queue\\Events\\JobQueued' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Events/JobQueued.php',
+ 'Illuminate\\Queue\\Events\\JobQueueing' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Events/JobQueueing.php',
'Illuminate\\Queue\\Events\\JobReleasedAfterException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Events/JobReleasedAfterException.php',
'Illuminate\\Queue\\Events\\JobRetryRequested' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Events/JobRetryRequested.php',
'Illuminate\\Queue\\Events\\JobTimedOut' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Events/JobTimedOut.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 5fd2e593..a454fcef 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1349,17 +1349,17 @@
},
{
"name": "laravel/framework",
- "version": "v10.41.0",
- "version_normalized": "10.41.0.0",
+ "version": "v10.42.0",
+ "version_normalized": "10.42.0.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "da31969bd35e6ee0bbcd9e876f88952dc754b012"
+ "reference": "fef1aff874a6749c44f8e142e5764eab8cb96890"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/da31969bd35e6ee0bbcd9e876f88952dc754b012",
- "reference": "da31969bd35e6ee0bbcd9e876f88952dc754b012",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/fef1aff874a6749c44f8e142e5764eab8cb96890",
+ "reference": "fef1aff874a6749c44f8e142e5764eab8cb96890",
"shasum": ""
},
"require": {
@@ -1508,7 +1508,7 @@
"symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.2).",
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)."
},
- "time": "2024-01-16T15:23:58+00:00",
+ "time": "2024-01-23T15:07:56+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -1557,17 +1557,17 @@
},
{
"name": "laravel/pint",
- "version": "v1.13.9",
- "version_normalized": "1.13.9.0",
+ "version": "v1.13.10",
+ "version_normalized": "1.13.10.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/pint.git",
- "reference": "e3e269cc5d874c8efd2dc7962b1c7ff2585fe525"
+ "reference": "e2b5060885694ca30ac008c05dc9d47f10ed1abf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/pint/zipball/e3e269cc5d874c8efd2dc7962b1c7ff2585fe525",
- "reference": "e3e269cc5d874c8efd2dc7962b1c7ff2585fe525",
+ "url": "https://api.github.com/repos/laravel/pint/zipball/e2b5060885694ca30ac008c05dc9d47f10ed1abf",
+ "reference": "e2b5060885694ca30ac008c05dc9d47f10ed1abf",
"shasum": ""
},
"require": {
@@ -1578,15 +1578,15 @@
"php": "^8.1.0"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^3.47.0",
- "illuminate/view": "^10.40.0",
+ "friendsofphp/php-cs-fixer": "^3.47.1",
+ "illuminate/view": "^10.41.0",
"larastan/larastan": "^2.8.1",
"laravel-zero/framework": "^10.3.0",
"mockery/mockery": "^1.6.7",
"nunomaduro/termwind": "^1.15.1",
"pestphp/pest": "^2.31.0"
},
- "time": "2024-01-16T17:39:29+00:00",
+ "time": "2024-01-22T09:04:15+00:00",
"bin": [
"builds/pint"
],
@@ -2616,17 +2616,17 @@
},
{
"name": "nesbot/carbon",
- "version": "2.72.1",
- "version_normalized": "2.72.1.0",
+ "version": "2.72.2",
+ "version_normalized": "2.72.2.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78"
+ "reference": "3e7edc41b58d65509baeb0d4a14c8fa41d627130"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2b3b3db0a2d0556a177392ff1a3bf5608fa09f78",
- "reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/3e7edc41b58d65509baeb0d4a14c8fa41d627130",
+ "reference": "3e7edc41b58d65509baeb0d4a14c8fa41d627130",
"shasum": ""
},
"require": {
@@ -2654,7 +2654,7 @@
"phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20",
"squizlabs/php_codesniffer": "^3.4"
},
- "time": "2023-12-08T23:47:49+00:00",
+ "time": "2024-01-19T00:21:53+00:00",
"bin": [
"bin/carbon"
],
@@ -2726,33 +2726,33 @@
},
{
"name": "nette/schema",
- "version": "v1.2.5",
- "version_normalized": "1.2.5.0",
+ "version": "v1.3.0",
+ "version_normalized": "1.3.0.0",
"source": {
"type": "git",
"url": "https://github.com/nette/schema.git",
- "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a"
+ "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nette/schema/zipball/0462f0166e823aad657c9224d0f849ecac1ba10a",
- "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a",
+ "url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
+ "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
"shasum": ""
},
"require": {
- "nette/utils": "^2.5.7 || ^3.1.5 || ^4.0",
- "php": "7.1 - 8.3"
+ "nette/utils": "^4.0",
+ "php": "8.1 - 8.3"
},
"require-dev": {
- "nette/tester": "^2.3 || ^2.4",
+ "nette/tester": "^2.4",
"phpstan/phpstan-nette": "^1.0",
- "tracy/tracy": "^2.7"
+ "tracy/tracy": "^2.8"
},
- "time": "2023-10-05T20:37:59+00:00",
+ "time": "2023-12-11T11:54:22+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2-dev"
+ "dev-master": "1.3-dev"
}
},
"installation-source": "dist",
@@ -2785,7 +2785,7 @@
],
"support": {
"issues": "https://github.com/nette/schema/issues",
- "source": "https://github.com/nette/schema/tree/v1.2.5"
+ "source": "https://github.com/nette/schema/tree/v1.3.0"
},
"install-path": "../nette/schema"
},
@@ -3660,17 +3660,17 @@
},
{
"name": "phpunit/phpunit",
- "version": "10.5.8",
- "version_normalized": "10.5.8.0",
+ "version": "10.5.9",
+ "version_normalized": "10.5.9.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "08f4fa74d5fbfff1ef22abffee47aaedcaea227e"
+ "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/08f4fa74d5fbfff1ef22abffee47aaedcaea227e",
- "reference": "08f4fa74d5fbfff1ef22abffee47aaedcaea227e",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe",
+ "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe",
"shasum": ""
},
"require": {
@@ -3704,7 +3704,7 @@
"suggest": {
"ext-soap": "To be able to generate mocks based on WSDL files"
},
- "time": "2024-01-19T07:07:27+00:00",
+ "time": "2024-01-22T14:35:40+00:00",
"bin": [
"phpunit"
],
@@ -3744,7 +3744,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.8"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.9"
},
"funding": [
{
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index b8b2c451..eef3331e 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'laravel/laravel',
'pretty_version' => 'dev-main',
'version' => 'dev-main',
- 'reference' => '031f7071e6d723126171aaae79112d82773417fe',
+ 'reference' => '468c2cd0e65223b904a5a1c2c15921b684d8b85b',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -169,199 +169,199 @@
'illuminate/auth' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/broadcasting' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/bus' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/cache' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/collections' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/conditionable' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/config' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/console' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/container' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/contracts' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/cookie' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/database' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/encryption' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/events' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/filesystem' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/hashing' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/http' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/log' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/macroable' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/mail' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/notifications' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/pagination' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/pipeline' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/process' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/queue' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/redis' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/routing' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/session' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/support' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/testing' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/translation' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/validation' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'illuminate/view' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v10.41.0',
+ 0 => 'v10.42.0',
),
),
'inertiajs/inertia-laravel' => array(
@@ -380,9 +380,9 @@
),
),
'laravel/framework' => array(
- 'pretty_version' => 'v10.41.0',
- 'version' => '10.41.0.0',
- 'reference' => 'da31969bd35e6ee0bbcd9e876f88952dc754b012',
+ 'pretty_version' => 'v10.42.0',
+ 'version' => '10.42.0.0',
+ 'reference' => 'fef1aff874a6749c44f8e142e5764eab8cb96890',
'type' => 'library',
'install_path' => __DIR__ . '/../laravel/framework',
'aliases' => array(),
@@ -391,16 +391,16 @@
'laravel/laravel' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
- 'reference' => '031f7071e6d723126171aaae79112d82773417fe',
+ 'reference' => '468c2cd0e65223b904a5a1c2c15921b684d8b85b',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'dev_requirement' => false,
),
'laravel/pint' => array(
- 'pretty_version' => 'v1.13.9',
- 'version' => '1.13.9.0',
- 'reference' => 'e3e269cc5d874c8efd2dc7962b1c7ff2585fe525',
+ 'pretty_version' => 'v1.13.10',
+ 'version' => '1.13.10.0',
+ 'reference' => 'e2b5060885694ca30ac008c05dc9d47f10ed1abf',
'type' => 'project',
'install_path' => __DIR__ . '/../laravel/pint',
'aliases' => array(),
@@ -530,18 +530,18 @@
'dev_requirement' => true,
),
'nesbot/carbon' => array(
- 'pretty_version' => '2.72.1',
- 'version' => '2.72.1.0',
- 'reference' => '2b3b3db0a2d0556a177392ff1a3bf5608fa09f78',
+ 'pretty_version' => '2.72.2',
+ 'version' => '2.72.2.0',
+ 'reference' => '3e7edc41b58d65509baeb0d4a14c8fa41d627130',
'type' => 'library',
'install_path' => __DIR__ . '/../nesbot/carbon',
'aliases' => array(),
'dev_requirement' => false,
),
'nette/schema' => array(
- 'pretty_version' => 'v1.2.5',
- 'version' => '1.2.5.0',
- 'reference' => '0462f0166e823aad657c9224d0f849ecac1ba10a',
+ 'pretty_version' => 'v1.3.0',
+ 'version' => '1.3.0.0',
+ 'reference' => 'a6d3a6d1f545f01ef38e60f375d1cf1f4de98188',
'type' => 'library',
'install_path' => __DIR__ . '/../nette/schema',
'aliases' => array(),
@@ -656,9 +656,9 @@
'dev_requirement' => true,
),
'phpunit/phpunit' => array(
- 'pretty_version' => '10.5.8',
- 'version' => '10.5.8.0',
- 'reference' => '08f4fa74d5fbfff1ef22abffee47aaedcaea227e',
+ 'pretty_version' => '10.5.9',
+ 'version' => '10.5.9.0',
+ 'reference' => '0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe',
'type' => 'library',
'install_path' => __DIR__ . '/../phpunit/phpunit',
'aliases' => array(),
diff --git a/vendor/laravel/framework/CHANGELOG.md b/vendor/laravel/framework/CHANGELOG.md
index 47ae1120..1c868986 100644
--- a/vendor/laravel/framework/CHANGELOG.md
+++ b/vendor/laravel/framework/CHANGELOG.md
@@ -1,6 +1,31 @@
# Release Notes for 10.x
-## [Unreleased](https://github.com/laravel/framework/compare/v10.40.0...10.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v10.41.0...10.x)
+
+## [v10.41.0](https://github.com/laravel/framework/compare/v10.40.0...v10.41.0) - 2024-01-16
+
+* [10.x] Add a `threshold` parameter to the `Number::spell` helper by [@caendesilva](https://github.com/caendesilva) in https://github.com/laravel/framework/pull/49610
+* Revert "[10.x] Make ComponentAttributeBag Arrayable" by [@luanfreitasdev](https://github.com/luanfreitasdev) in https://github.com/laravel/framework/pull/49623
+* [10.x] Fix return value and docblock by [@dwightwatson](https://github.com/dwightwatson) in https://github.com/laravel/framework/pull/49627
+* [10.x] Add an option to specify the default path to the models directory for `php artisan model:prune` by [@dbhynds](https://github.com/dbhynds) in https://github.com/laravel/framework/pull/49617
+* [10.x] Allow job chains to be conditionally dispatched by [@fjarrett](https://github.com/fjarrett) in https://github.com/laravel/framework/pull/49624
+* [10.x] Add test for existing empty test by [@lioneaglesolutions](https://github.com/lioneaglesolutions) in https://github.com/laravel/framework/pull/49632
+* [10.x] Add additional context to Mailable assertion messages by [@lioneaglesolutions](https://github.com/lioneaglesolutions) in https://github.com/laravel/framework/pull/49631
+* [10.x] Allow job batches to be conditionally dispatched by [@fjarrett](https://github.com/fjarrett) in https://github.com/laravel/framework/pull/49639
+* [10.x] Revert parameter name change by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/framework/pull/49659
+* [10.x] Printing Name of The Method that Calls `ensureIntlExtensionIsInstalled` in `Number` class. by [@devajmeireles](https://github.com/devajmeireles) in https://github.com/laravel/framework/pull/49660
+* [10.x] Update pagination tailwind.blade.php by [@anasmorahhib](https://github.com/anasmorahhib) in https://github.com/laravel/framework/pull/49665
+* [10.x] feat: add base argument to Stringable->toInteger() by [@adamczykpiotr](https://github.com/adamczykpiotr) in https://github.com/laravel/framework/pull/49670
+* [10.x]: Remove unused class ShouldBeUnique when make a job by [@Kenini1805](https://github.com/Kenini1805) in https://github.com/laravel/framework/pull/49669
+* [10.x] Add tests for Eloquent methods by [@milwad-dev](https://github.com/milwad-dev) in https://github.com/laravel/framework/pull/49673
+* Implement draft workflow by [@driesvints](https://github.com/driesvints) in https://github.com/laravel/framework/pull/49683
+* [10.x] Fixing Types, Word and Returns of `Number`class. by [@devajmeireles](https://github.com/devajmeireles) in https://github.com/laravel/framework/pull/49681
+* [10.x] Test Improvements by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/49679
+* [10.x] Officially support floats in trans_choice and Translator::choice by [@philbates35](https://github.com/philbates35) in https://github.com/laravel/framework/pull/49693
+* [10.x] Use static function by [@michaelnabil230](https://github.com/michaelnabil230) in https://github.com/laravel/framework/pull/49696
+* [10.x] Revert "[10.x] Improve numeric comparison for custom casts" by [@driesvints](https://github.com/driesvints) in https://github.com/laravel/framework/pull/49702
+* [10.x] Add exit code to queue:clear, and queue:forget commands by [@bytestream](https://github.com/bytestream) in https://github.com/laravel/framework/pull/49707
+* [10.x] Allow StreamInterface as raw HTTP Client body by [@janolivermr](https://github.com/janolivermr) in https://github.com/laravel/framework/pull/49705
## [v10.40.0](https://github.com/laravel/framework/compare/v10.39.0...v10.40.0) - 2024-01-09
diff --git a/vendor/laravel/framework/src/Illuminate/Collections/LazyCollection.php b/vendor/laravel/framework/src/Illuminate/Collections/LazyCollection.php
index ce84977a..e741ba0b 100644
--- a/vendor/laravel/framework/src/Illuminate/Collections/LazyCollection.php
+++ b/vendor/laravel/framework/src/Illuminate/Collections/LazyCollection.php
@@ -1740,6 +1740,8 @@ class LazyCollection implements CanBeEscapedWhenCastToString, Enumerable
*/
protected function now()
{
- return Carbon::now()->timestamp;
+ return class_exists(Carbon::class)
+ ? Carbon::now()->timestamp
+ : time();
}
}
diff --git a/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php b/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php
index 23fc17ee..c9485337 100644
--- a/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php
+++ b/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php
@@ -546,7 +546,7 @@ class Filesystem
{
$hash = @md5_file($firstFile);
- return $hash && $hash === @md5_file($secondFile);
+ return $hash && hash_equals($hash, (string) @md5_file($secondFile));
}
/**
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Application.php b/vendor/laravel/framework/src/Illuminate/Foundation/Application.php
index a352be0f..34a5c99f 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Application.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Application.php
@@ -40,7 +40,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
*
* @var string
*/
- const VERSION = '10.41.0';
+ const VERSION = '10.42.0';
/**
* The base path for the Laravel installation.
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Client/Factory.php b/vendor/laravel/framework/src/Illuminate/Http/Client/Factory.php
index d3411ce1..4bcd13d2 100644
--- a/vendor/laravel/framework/src/Illuminate/Http/Client/Factory.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/Client/Factory.php
@@ -36,6 +36,13 @@ class Factory
*/
protected $globalMiddleware = [];
+ /**
+ * The options to apply to every request.
+ *
+ * @var array
+ */
+ protected $globalOptions = [];
+
/**
* The stub callables that will handle requests.
*
@@ -123,6 +130,19 @@ class Factory
return $this;
}
+ /**
+ * Set the options to apply to every request.
+ *
+ * @param array $options
+ * @return $this
+ */
+ public function globalOptions($options)
+ {
+ $this->globalOptions = $options;
+
+ return $this;
+ }
+
/**
* Create a new response instance for use during stubbing.
*
@@ -400,7 +420,7 @@ class Factory
*/
protected function newPendingRequest()
{
- return new PendingRequest($this, $this->globalMiddleware);
+ return (new PendingRequest($this, $this->globalMiddleware))->withOptions($this->globalOptions);
}
/**
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/Transport/LogTransport.php b/vendor/laravel/framework/src/Illuminate/Mail/Transport/LogTransport.php
index 29125120..682169e3 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/Transport/LogTransport.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/Transport/LogTransport.php
@@ -2,6 +2,7 @@
namespace Illuminate\Mail\Transport;
+use Illuminate\Support\Str;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Envelope;
use Symfony\Component\Mailer\SentMessage;
@@ -33,17 +34,48 @@ class LogTransport implements TransportInterface
*/
public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage
{
- $string = $message->toString();
+ $string = Str::of($message->toString());
- if (str_contains($string, 'Content-Transfer-Encoding: quoted-printable')) {
- $string = quoted_printable_decode($string);
+ if ($string->contains('Content-Type: multipart/')) {
+ $boundary = $string
+ ->after('boundary=')
+ ->before("\r\n")
+ ->prepend('--')
+ ->append("\r\n");
+
+ $string = $string
+ ->explode($boundary)
+ ->map($this->decodeQuotedPrintableContent(...))
+ ->implode($boundary);
+ } elseif ($string->contains('Content-Transfer-Encoding: quoted-printable')) {
+ $string = $this->decodeQuotedPrintableContent($string);
}
- $this->logger->debug($string);
+ $this->logger->debug((string) $string);
return new SentMessage($message, $envelope ?? Envelope::create($message));
}
+ /**
+ * Decode the given quoted printable content.
+ *
+ * @param string $part
+ * @return string
+ */
+ protected function decodeQuotedPrintableContent(string $part)
+ {
+ if (! str_contains($part, 'Content-Transfer-Encoding: quoted-printable')) {
+ return $part;
+ }
+
+ [$headers, $content] = explode("\r\n\r\n", $part, 2);
+
+ return implode("\r\n\r\n", [
+ $headers,
+ quoted_printable_decode($content),
+ ]);
+ }
+
/**
* Get the logger for the LogTransport instance.
*
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/Events/JobQueueing.php b/vendor/laravel/framework/src/Illuminate/Queue/Events/JobQueueing.php
new file mode 100644
index 00000000..ebb07696
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Queue/Events/JobQueueing.php
@@ -0,0 +1,58 @@
+connectionName = $connectionName;
+ $this->job = $job;
+ $this->payload = $payload;
+ }
+
+ /**
+ * Get the decoded job payload.
+ *
+ * @return array
+ */
+ public function payload()
+ {
+ if ($this->payload === null) {
+ throw new RuntimeException('The job payload was not provided when the event was dispatched.');
+ }
+
+ return json_decode($this->payload, true, flags: JSON_THROW_ON_ERROR);
+ }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/Queue.php b/vendor/laravel/framework/src/Illuminate/Queue/Queue.php
index 1aa09ee3..09eb2452 100644
--- a/vendor/laravel/framework/src/Illuminate/Queue/Queue.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/Queue.php
@@ -9,6 +9,7 @@ use Illuminate\Contracts\Encryption\Encrypter;
use Illuminate\Contracts\Queue\ShouldBeEncrypted;
use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
use Illuminate\Queue\Events\JobQueued;
+use Illuminate\Queue\Events\JobQueueing;
use Illuminate\Support\Arr;
use Illuminate\Support\InteractsWithTime;
use Illuminate\Support\Str;
@@ -327,6 +328,8 @@ abstract class Queue
$this->container->bound('db.transactions')) {
return $this->container->make('db.transactions')->addCallback(
function () use ($payload, $queue, $delay, $callback, $job) {
+ $this->raiseJobQueueingEvent($job, $payload);
+
return tap($callback($payload, $queue, $delay), function ($jobId) use ($job, $payload) {
$this->raiseJobQueuedEvent($jobId, $job, $payload);
});
@@ -334,6 +337,8 @@ abstract class Queue
);
}
+ $this->raiseJobQueueingEvent($job, $payload);
+
return tap($callback($payload, $queue, $delay), function ($jobId) use ($job, $payload) {
$this->raiseJobQueuedEvent($jobId, $job, $payload);
});
@@ -362,6 +367,20 @@ abstract class Queue
return false;
}
+ /**
+ * Raise the job queueing event.
+ *
+ * @param \Closure|string|object $job
+ * @param string $payload
+ * @return void
+ */
+ protected function raiseJobQueueingEvent($job, $payload)
+ {
+ if ($this->container->bound('events')) {
+ $this->container['events']->dispatch(new JobQueueing($this->connectionName, $job, $payload));
+ }
+ }
+
/**
* Raise the job queued event.
*
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Carbon.php b/vendor/laravel/framework/src/Illuminate/Support/Carbon.php
index c1a665c7..34391899 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Carbon.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Carbon.php
@@ -29,9 +29,11 @@ class Carbon extends BaseCarbon
*/
public static function createFromId($id)
{
- return Ulid::isValid($id)
- ? static::createFromInterface(Ulid::fromString($id)->getDateTime())
- : static::createFromInterface(Uuid::fromString($id)->getDateTime());
+ if (is_string($id)) {
+ $id = Ulid::isValid($id) ? Ulid::fromString($id) : Uuid::fromString($id);
+ }
+
+ return static::createFromInterface($id->getDateTime());
}
/**
diff --git a/vendor/laravel/framework/src/Illuminate/Support/DefaultProviders.php b/vendor/laravel/framework/src/Illuminate/Support/DefaultProviders.php
index ef7422fd..395b7cb9 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/DefaultProviders.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/DefaultProviders.php
@@ -33,10 +33,10 @@ class DefaultProviders
\Illuminate\Mail\MailServiceProvider::class,
\Illuminate\Notifications\NotificationServiceProvider::class,
\Illuminate\Pagination\PaginationServiceProvider::class,
+ \Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
\Illuminate\Pipeline\PipelineServiceProvider::class,
\Illuminate\Queue\QueueServiceProvider::class,
\Illuminate\Redis\RedisServiceProvider::class,
- \Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
\Illuminate\Session\SessionServiceProvider::class,
\Illuminate\Translation\TranslationServiceProvider::class,
\Illuminate\Validation\ValidationServiceProvider::class,
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Http.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Http.php
index 4c0cbd91..ddd8e80b 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Http.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Http.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Client\Factory;
* @method static \Illuminate\Http\Client\Factory globalMiddleware(callable $middleware)
* @method static \Illuminate\Http\Client\Factory globalRequestMiddleware(callable $middleware)
* @method static \Illuminate\Http\Client\Factory globalResponseMiddleware(callable $middleware)
+ * @method static \Illuminate\Http\Client\Factory globalOptions(array $options)
* @method static \GuzzleHttp\Promise\PromiseInterface response(array|string|null $body = null, int $status = 200, array $headers = [])
* @method static \Illuminate\Http\Client\ResponseSequence sequence(array $responses = [])
* @method static \Illuminate\Http\Client\Factory allowStrayRequests()
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Notification.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Notification.php
index e82aa052..a588bd54 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Notification.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Notification.php
@@ -54,6 +54,23 @@ class Notification extends Facade
});
}
+ /**
+ * Begin sending a notification to an anonymous notifiable on the given channels.
+ *
+ * @param array $channels
+ * @return \Illuminate\Notifications\AnonymousNotifiable
+ */
+ public static function routes(array $channels)
+ {
+ $notifiable = new AnonymousNotifiable;
+
+ foreach ($channels as $channel => $route) {
+ $notifiable->route($channel, $route);
+ }
+
+ return $notifiable;
+ }
+
/**
* Begin sending a notification to an anonymous notifiable.
*
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Str.php b/vendor/laravel/framework/src/Illuminate/Support/Str.php
index 4d51462f..fc444ba6 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Str.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Str.php
@@ -390,6 +390,27 @@ class Str
return $before.$value.($after ??= $before);
}
+ /**
+ * Unwrap the string with the given strings.
+ *
+ * @param string $value
+ * @param string $before
+ * @param string|null $after
+ * @return string
+ */
+ public static function unwrap($value, $before, $after = null)
+ {
+ if (static::startsWith($value, $before)) {
+ $value = static::substr($value, static::length($before));
+ }
+
+ if (static::endsWith($value, $after ??= $before)) {
+ $value = static::substr($value, 0, -static::length($after));
+ }
+
+ return $value;
+ }
+
/**
* Determine if a given string matches a given pattern.
*
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Stringable.php b/vendor/laravel/framework/src/Illuminate/Support/Stringable.php
index 144cbb8c..cc1157b5 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Stringable.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Stringable.php
@@ -1224,6 +1224,18 @@ class Stringable implements JsonSerializable, ArrayAccess
return new static(Str::wrap($this->value, $before, $after));
}
+ /**
+ * Unwrap the string with the given strings.
+ *
+ * @param string $before
+ * @param string|null $after
+ * @return static
+ */
+ public function unwrap($before, $after = null)
+ {
+ return new static(Str::unwrap($this->value, $before, $after));
+ }
+
/**
* Convert the string into a `HtmlString` instance.
*
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/Rule.php b/vendor/laravel/framework/src/Illuminate/Validation/Rule.php
index 1f8286cc..df28c893 100644
--- a/vendor/laravel/framework/src/Illuminate/Validation/Rule.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/Rule.php
@@ -56,7 +56,7 @@ class Rule
*/
public static function unless($condition, $rules, $defaultRules = [])
{
- return new ConditionalRules(! $condition, $rules, $defaultRules);
+ return new ConditionalRules($condition, $defaultRules, $rules);
}
/**
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/Rules/Password.php b/vendor/laravel/framework/src/Illuminate/Validation/Rules/Password.php
index 93e06dc5..588f3573 100644
--- a/vendor/laravel/framework/src/Illuminate/Validation/Rules/Password.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/Rules/Password.php
@@ -37,6 +37,13 @@ class Password implements Rule, DataAwareRule, ValidatorAwareRule
*/
protected $min = 8;
+ /**
+ * The maximum size of the password.
+ *
+ * @var int
+ */
+ protected $max;
+
/**
* If the password requires at least one uppercase and one lowercase letter.
*
@@ -193,7 +200,7 @@ class Password implements Rule, DataAwareRule, ValidatorAwareRule
}
/**
- * Sets the minimum size of the password.
+ * Set the minimum size of the password.
*
* @param int $size
* @return $this
@@ -203,6 +210,19 @@ class Password implements Rule, DataAwareRule, ValidatorAwareRule
return new static($size);
}
+ /**
+ * Set the maximum size of the password.
+ *
+ * @param int $size
+ * @return $this
+ */
+ public function max($size)
+ {
+ $this->max = $size;
+
+ return $this;
+ }
+
/**
* Ensures the password has not been compromised in data leaks.
*
@@ -300,6 +320,10 @@ class Password implements Rule, DataAwareRule, ValidatorAwareRule
return;
}
+ if ($this->max && mb_strlen($value) > $this->max) {
+ $validator->addFailure($attribute, 'max.string');
+ }
+
if ($this->mixedCase && ! preg_match('/(\p{Ll}+.*\p{Lu})|(\p{Lu}+.*\p{Ll})/u', $value)) {
$validator->addFailure($attribute, 'password.mixed');
}
diff --git a/vendor/laravel/pint/builds/pint b/vendor/laravel/pint/builds/pint
index a9f7a2b6..6bbe5d0f 100644
Binary files a/vendor/laravel/pint/builds/pint and b/vendor/laravel/pint/builds/pint differ
diff --git a/vendor/laravel/pint/composer.json b/vendor/laravel/pint/composer.json
index 50b201d1..477fdbd7 100644
--- a/vendor/laravel/pint/composer.json
+++ b/vendor/laravel/pint/composer.json
@@ -23,8 +23,8 @@
"ext-xml": "*"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^3.47.0",
- "illuminate/view": "^10.40.0",
+ "friendsofphp/php-cs-fixer": "^3.47.1",
+ "illuminate/view": "^10.41.0",
"larastan/larastan": "^2.8.1",
"laravel-zero/framework": "^10.3.0",
"mockery/mockery": "^1.6.7",
diff --git a/vendor/nesbot/carbon/readme.md b/vendor/nesbot/carbon/readme.md
index 0b379713..c3e121ac 100644
--- a/vendor/nesbot/carbon/readme.md
+++ b/vendor/nesbot/carbon/readme.md
@@ -120,33 +120,41 @@ This project exists thanks to all the people who contribute.
Support this project by becoming a sponsor. Your logo will show up here with a link to your website.
+ Welcome to {{ $page.props.appName }} +
++ Please, login in to begin +
+ +
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
[[Become a sponsor via OpenCollective](https://opencollective.com/Carbon#sponsor)]
+
-
+
[[Become a sponsor via GitHub](https://github.com/sponsors/kylekatarnls)]
diff --git a/vendor/nesbot/carbon/sponsors.php b/vendor/nesbot/carbon/sponsors.php
index 8d607585..41817d68 100644
--- a/vendor/nesbot/carbon/sponsors.php
+++ b/vendor/nesbot/carbon/sponsors.php
@@ -99,8 +99,8 @@ function getOpenCollectiveSponsors(): string
[$x, $y] = @getimagesize($src) ?: [0, 0];
$validImage = ($x && $y);
$src = $validImage ? htmlspecialchars($src) : 'https://opencollective.com/static/images/default-guest-logo.svg';
- $height = $member['status'] === 'sponsor' ? 64 : 48;
- $width = min(128, $validImage ? round($x * $height / $y) : $height);
+ $height = $member['status'] === 'sponsor' ? 64 : 42;
+ $width = min($height * 2, $validImage ? round($x * $height / $y) : $height);
$href .= (strpos($href, '?') === false ? '?' : '&').'utm_source=opencollective&utm_medium=github&utm_campaign=Carbon';
$title = htmlspecialchars(($member['description'] ?? null) ?: $member['name']);
$alt = htmlspecialchars($member['name']);
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/hu.php b/vendor/nesbot/carbon/src/Carbon/Lang/hu.php
index b2d2ac11..b7583eec 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/hu.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/hu.php
@@ -82,7 +82,7 @@ return [
'second_before' => ':count másodperccel',
's_before' => ':count másodperccel',
'months' => ['január', 'február', 'március', 'április', 'május', 'június', 'július', 'augusztus', 'szeptember', 'október', 'november', 'december'],
- 'months_short' => ['jan.', 'feb.', 'márc.', 'ápr.', 'máj.', 'jún.', 'júl.', 'aug.', 'szept.', 'okt.', 'nov.', 'dec.'],
+ 'months_short' => ['jan.', 'febr.', 'márc.', 'ápr.', 'máj.', 'jún.', 'júl.', 'aug.', 'szept.', 'okt.', 'nov.', 'dec.'],
'weekdays' => ['vasárnap', 'hétfő', 'kedd', 'szerda', 'csütörtök', 'péntek', 'szombat'],
'weekdays_short' => ['vas', 'hét', 'kedd', 'sze', 'csüt', 'pén', 'szo'],
'weekdays_min' => ['v', 'h', 'k', 'sze', 'cs', 'p', 'sz'],
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sk.php b/vendor/nesbot/carbon/src/Carbon/Lang/sk.php
index 1c449d74..f9702e96 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/sk.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/sk.php
@@ -147,7 +147,7 @@ return [
'sameElse' => 'L',
],
'weekdays' => ['nedeľa', 'pondelok', 'utorok', 'streda', 'štvrtok', 'piatok', 'sobota'],
- 'weekdays_short' => ['ned', 'pod', 'uto', 'str', 'štv', 'pia', 'sob'],
+ 'weekdays_short' => ['ned', 'pon', 'uto', 'str', 'štv', 'pia', 'sob'],
'weekdays_min' => ['ne', 'po', 'ut', 'st', 'št', 'pi', 'so'],
'months' => ['január', 'február', 'marec', 'apríl', 'máj', 'jún', 'júl', 'august', 'september', 'október', 'november', 'december'],
'months_short' => ['jan', 'feb', 'mar', 'apr', 'máj', 'jún', 'júl', 'aug', 'sep', 'okt', 'nov', 'dec'],
diff --git a/vendor/nette/schema/composer.json b/vendor/nette/schema/composer.json
index 69729eea..626e98f9 100644
--- a/vendor/nette/schema/composer.json
+++ b/vendor/nette/schema/composer.json
@@ -15,12 +15,12 @@
}
],
"require": {
- "php": "7.1 - 8.3",
- "nette/utils": "^2.5.7 || ^3.1.5 || ^4.0"
+ "php": "8.1 - 8.3",
+ "nette/utils": "^4.0"
},
"require-dev": {
- "nette/tester": "^2.3 || ^2.4",
- "tracy/tracy": "^2.7",
+ "nette/tester": "^2.4",
+ "tracy/tracy": "^2.8",
"phpstan/phpstan-nette": "^1.0"
},
"autoload": {
@@ -33,7 +33,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.2-dev"
+ "dev-master": "1.3-dev"
}
}
}
diff --git a/vendor/nette/schema/readme.md b/vendor/nette/schema/readme.md
index 1e6714b5..c88f6bd2 100644
--- a/vendor/nette/schema/readme.md
+++ b/vendor/nette/schema/readme.md
@@ -21,7 +21,7 @@ Installation:
composer require nette/schema
```
-It requires PHP version 7.1 and supports PHP up to 8.3.
+It requires PHP version 8.1 and supports PHP up to 8.3.
[Support Me](https://github.com/sponsors/dg)
@@ -439,7 +439,7 @@ Expect::structure([
// creates '$obj = new Info' and writes to $obj->processRefund and $obj->refundAmount
```
-If the class has a constructor, the elements of the structure are passed as named parameters to the constructor (requires PHP 8):
+If the class has a constructor, the elements of the structure are passed as named parameters to the constructor:
```php
class Info
diff --git a/vendor/nette/schema/src/Schema/Context.php b/vendor/nette/schema/src/Schema/Context.php
index b72c48b4..0f512656 100644
--- a/vendor/nette/schema/src/Schema/Context.php
+++ b/vendor/nette/schema/src/Schema/Context.php
@@ -9,30 +9,24 @@ declare(strict_types=1);
namespace Nette\Schema;
-use Nette;
-
final class Context
{
- use Nette\SmartObject;
-
- /** @var bool */
- public $skipDefaults = false;
+ public bool $skipDefaults = false;
/** @var string[] */
- public $path = [];
+ public array $path = [];
- /** @var bool */
- public $isKey = false;
+ public bool $isKey = false;
/** @var Message[] */
- public $errors = [];
+ public array $errors = [];
/** @var Message[] */
- public $warnings = [];
+ public array $warnings = [];
/** @var array[] */
- public $dynamics = [];
+ public array $dynamics = [];
public function addError(string $message, string $code, array $variables = []): Message
@@ -52,8 +46,6 @@ final class Context
public function createChecker(): \Closure
{
$count = count($this->errors);
- return function () use ($count): bool {
- return $count === count($this->errors);
- };
+ return fn(): bool => $count === count($this->errors);
}
}
diff --git a/vendor/nette/schema/src/Schema/Elements/AnyOf.php b/vendor/nette/schema/src/Schema/Elements/AnyOf.php
index 446d6ff5..6c9d0cea 100644
--- a/vendor/nette/schema/src/Schema/Elements/AnyOf.php
+++ b/vendor/nette/schema/src/Schema/Elements/AnyOf.php
@@ -18,16 +18,11 @@ use Nette\Schema\Schema;
final class AnyOf implements Schema
{
use Base;
- use Nette\SmartObject;
- /** @var array */
- private $set;
+ private array $set;
- /**
- * @param mixed|Schema ...$set
- */
- public function __construct(...$set)
+ public function __construct(mixed ...$set)
{
if (!$set) {
throw new Nette\InvalidStateException('The enumeration must not be empty.');
@@ -61,13 +56,13 @@ final class AnyOf implements Schema
/********************* processing ****************d*g**/
- public function normalize($value, Context $context)
+ public function normalize(mixed $value, Context $context): mixed
{
return $this->doNormalize($value, $context);
}
- public function merge($value, $base)
+ public function merge(mixed $value, mixed $base): mixed
{
if (is_array($value) && isset($value[Helpers::PreventMerging])) {
unset($value[Helpers::PreventMerging]);
@@ -78,7 +73,7 @@ final class AnyOf implements Schema
}
- public function complete($value, Context $context)
+ public function complete(mixed $value, Context $context): mixed
{
$isOk = $context->createChecker();
$value = $this->findAlternative($value, $context);
@@ -87,7 +82,7 @@ final class AnyOf implements Schema
}
- private function findAlternative($value, Context $context)
+ private function findAlternative(mixed $value, Context $context): mixed
{
$expecteds = $innerErrors = [];
foreach ($this->set as $item) {
@@ -125,18 +120,20 @@ final class AnyOf implements Schema
[
'value' => $value,
'expected' => implode('|', array_unique($expecteds)),
- ]
+ ],
);
}
+
+ return null;
}
- public function completeDefault(Context $context)
+ public function completeDefault(Context $context): mixed
{
if ($this->required) {
$context->addError(
'The mandatory item %path% is missing.',
- Nette\Schema\Message::MissingItem
+ Nette\Schema\Message::MissingItem,
);
return null;
}
diff --git a/vendor/nette/schema/src/Schema/Elements/Base.php b/vendor/nette/schema/src/Schema/Elements/Base.php
index 4b445147..1dfda8a2 100644
--- a/vendor/nette/schema/src/Schema/Elements/Base.php
+++ b/vendor/nette/schema/src/Schema/Elements/Base.php
@@ -19,23 +19,18 @@ use Nette\Schema\Helpers;
*/
trait Base
{
- /** @var bool */
- private $required = false;
+ private bool $required = false;
+ private mixed $default = null;
- /** @var mixed */
- private $default;
-
- /** @var callable|null */
+ /** @var ?callable */
private $before;
/** @var callable[] */
- private $transforms = [];
-
- /** @var string|null */
- private $deprecated;
+ private array $transforms = [];
+ private ?string $deprecated = null;
- public function default($value): self
+ public function default(mixed $value): self
{
$this->default = $value;
return $this;
@@ -79,7 +74,7 @@ trait Base
$context->addError(
'Failed assertion ' . ($description ? "'%assertion%'" : '%assertion%') . ' for %label% %path% with value %value%.',
Nette\Schema\Message::FailedAssertion,
- ['value' => $value, 'assertion' => $expected]
+ ['value' => $value, 'assertion' => $expected],
);
});
}
@@ -93,12 +88,12 @@ trait Base
}
- public function completeDefault(Context $context)
+ public function completeDefault(Context $context): mixed
{
if ($this->required) {
$context->addError(
'The mandatory item %path% is missing.',
- Nette\Schema\Message::MissingItem
+ Nette\Schema\Message::MissingItem,
);
return null;
}
@@ -107,7 +102,7 @@ trait Base
}
- public function doNormalize($value, Context $context)
+ public function doNormalize(mixed $value, Context $context): mixed
{
if ($this->before) {
$value = ($this->before)($value);
@@ -122,13 +117,13 @@ trait Base
if ($this->deprecated !== null) {
$context->addWarning(
$this->deprecated,
- Nette\Schema\Message::Deprecated
+ Nette\Schema\Message::Deprecated,
);
}
}
- private function doTransform($value, Context $context)
+ private function doTransform(mixed $value, Context $context): mixed
{
$isOk = $context->createChecker();
foreach ($this->transforms as $handler) {
@@ -142,7 +137,7 @@ trait Base
/** @deprecated use Nette\Schema\Validators::validateType() */
- private function doValidate($value, string $expected, Context $context): bool
+ private function doValidate(mixed $value, string $expected, Context $context): bool
{
$isOk = $context->createChecker();
Helpers::validateType($value, $expected, $context);
@@ -151,7 +146,7 @@ trait Base
/** @deprecated use Nette\Schema\Validators::validateRange() */
- private static function doValidateRange($value, array $range, Context $context, string $types = ''): bool
+ private static function doValidateRange(mixed $value, array $range, Context $context, string $types = ''): bool
{
$isOk = $context->createChecker();
Helpers::validateRange($value, $range, $context, $types);
@@ -160,7 +155,7 @@ trait Base
/** @deprecated use doTransform() */
- private function doFinalize($value, Context $context)
+ private function doFinalize(mixed $value, Context $context): mixed
{
return $this->doTransform($value, $context);
}
diff --git a/vendor/nette/schema/src/Schema/Elements/Structure.php b/vendor/nette/schema/src/Schema/Elements/Structure.php
index 02ca77b4..56f5ffe8 100644
--- a/vendor/nette/schema/src/Schema/Elements/Structure.php
+++ b/vendor/nette/schema/src/Schema/Elements/Structure.php
@@ -18,19 +18,16 @@ use Nette\Schema\Schema;
final class Structure implements Schema
{
use Base;
- use Nette\SmartObject;
/** @var Schema[] */
- private $items;
+ private array $items;
- /** @var Schema|null for array|list */
- private $otherItems;
+ /** for array|list */
+ private ?Schema $otherItems = null;
/** @var array{?int, ?int} */
- private $range = [null, null];
-
- /** @var bool */
- private $skipDefaults = false;
+ private array $range = [null, null];
+ private bool $skipDefaults = false;
/**
@@ -45,7 +42,7 @@ final class Structure implements Schema
}
- public function default($value): self
+ public function default(mixed $value): self
{
throw new Nette\InvalidStateException('Structure cannot have default value.');
}
@@ -65,10 +62,7 @@ final class Structure implements Schema
}
- /**
- * @param string|Schema $type
- */
- public function otherItems($type = 'mixed'): self
+ public function otherItems(string|Schema $type = 'mixed'): self
{
$this->otherItems = $type instanceof Schema ? $type : new Type($type);
return $this;
@@ -85,7 +79,7 @@ final class Structure implements Schema
/********************* processing ****************d*g**/
- public function normalize($value, Context $context)
+ public function normalize(mixed $value, Context $context): mixed
{
if ($prevent = (is_array($value) && isset($value[Helpers::PreventMerging]))) {
unset($value[Helpers::PreventMerging]);
@@ -115,7 +109,7 @@ final class Structure implements Schema
}
- public function merge($value, $base)
+ public function merge(mixed $value, mixed $base): mixed
{
if (is_array($value) && isset($value[Helpers::PreventMerging])) {
unset($value[Helpers::PreventMerging]);
@@ -145,7 +139,7 @@ final class Structure implements Schema
}
- public function complete($value, Context $context)
+ public function complete(mixed $value, Context $context): mixed
{
if ($value === null) {
$value = []; // is unable to distinguish null from array in NEON
@@ -171,11 +165,11 @@ final class Structure implements Schema
} else {
$keys = array_map('strval', array_keys($items));
foreach ($extraKeys as $key) {
- $hint = Nette\Utils\ObjectHelpers::getSuggestion($keys, (string) $key);
+ $hint = Nette\Utils\Helpers::getSuggestion($keys, (string) $key);
$context->addError(
'Unexpected item %path%' . ($hint ? ", did you mean '%hint%'?" : '.'),
Nette\Schema\Message::UnexpectedItem,
- ['hint' => $hint]
+ ['hint' => $hint],
)->path[] = $key;
}
}
@@ -197,7 +191,7 @@ final class Structure implements Schema
}
- public function completeDefault(Context $context)
+ public function completeDefault(Context $context): mixed
{
return $this->required
? $this->complete([], $context)
diff --git a/vendor/nette/schema/src/Schema/Elements/Type.php b/vendor/nette/schema/src/Schema/Elements/Type.php
index c953c6ad..4094442e 100644
--- a/vendor/nette/schema/src/Schema/Elements/Type.php
+++ b/vendor/nette/schema/src/Schema/Elements/Type.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
namespace Nette\Schema\Elements;
-use Nette;
use Nette\Schema\Context;
use Nette\Schema\DynamicParameter;
use Nette\Schema\Helpers;
@@ -19,25 +18,15 @@ use Nette\Schema\Schema;
final class Type implements Schema
{
use Base;
- use Nette\SmartObject;
- /** @var string */
- private $type;
-
- /** @var Schema|null for arrays */
- private $itemsValue;
-
- /** @var Schema|null for arrays */
- private $itemsKey;
+ private string $type;
+ private ?Schema $itemsValue = null;
+ private ?Schema $itemsKey = null;
/** @var array{?float, ?float} */
- private $range = [null, null];
-
- /** @var string|null */
- private $pattern;
-
- /** @var bool */
- private $merge = true;
+ private array $range = [null, null];
+ private ?string $pattern = null;
+ private bool $merge = true;
public function __construct(string $type)
@@ -84,11 +73,9 @@ final class Type implements Schema
/**
- * @param string|Schema $valueType
- * @param string|Schema|null $keyType
* @internal use arrayOf() or listOf()
*/
- public function items($valueType = 'mixed', $keyType = null): self
+ public function items(string|Schema $valueType = 'mixed', string|Schema $keyType = null): self
{
$this->itemsValue = $valueType instanceof Schema
? $valueType
@@ -110,7 +97,7 @@ final class Type implements Schema
/********************* processing ****************d*g**/
- public function normalize($value, Context $context)
+ public function normalize(mixed $value, Context $context): mixed
{
if ($prevent = (is_array($value) && isset($value[Helpers::PreventMerging]))) {
unset($value[Helpers::PreventMerging]);
@@ -141,7 +128,7 @@ final class Type implements Schema
}
- public function merge($value, $base)
+ public function merge(mixed $value, mixed $base): mixed
{
if (is_array($value) && isset($value[Helpers::PreventMerging])) {
unset($value[Helpers::PreventMerging]);
@@ -168,7 +155,7 @@ final class Type implements Schema
}
- public function complete($value, Context $context)
+ public function complete(mixed $value, Context $context): mixed
{
$merge = $this->merge;
if (is_array($value) && isset($value[Helpers::PreventMerging])) {
diff --git a/vendor/nette/schema/src/Schema/Expect.php b/vendor/nette/schema/src/Schema/Expect.php
index f2999502..38f1c81f 100644
--- a/vendor/nette/schema/src/Schema/Expect.php
+++ b/vendor/nette/schema/src/Schema/Expect.php
@@ -32,8 +32,6 @@ use Nette\Schema\Elements\Type;
*/
final class Expect
{
- use Nette\SmartObject;
-
public static function __callStatic(string $name, array $args): Type
{
$type = new Type($name);
@@ -51,10 +49,7 @@ final class Expect
}
- /**
- * @param mixed|Schema ...$set
- */
- public static function anyOf(...$set): AnyOf
+ public static function anyOf(mixed ...$set): AnyOf
{
return new AnyOf(...$set);
}
@@ -69,21 +64,20 @@ final class Expect
}
- /**
- * @param object $object
- */
- public static function from($object, array $items = []): Structure
+ public static function from(object $object, array $items = []): Structure
{
$ro = new \ReflectionObject($object);
- foreach ($ro->getProperties() as $prop) {
- $type = Helpers::getPropertyType($prop) ?? 'mixed';
+ $props = $ro->hasMethod('__construct')
+ ? $ro->getMethod('__construct')->getParameters()
+ : $ro->getProperties();
+
+ foreach ($props as $prop) {
$item = &$items[$prop->getName()];
if (!$item) {
+ $type = Helpers::getPropertyType($prop) ?? 'mixed';
$item = new Type($type);
- if (PHP_VERSION_ID >= 70400 && !$prop->isInitialized($object)) {
- $item->required();
- } else {
- $def = $prop->getValue($object);
+ if ($prop instanceof \ReflectionProperty ? $prop->isInitialized($object) : $prop->isOptional()) {
+ $def = ($prop instanceof \ReflectionProperty ? $prop->getValue($object) : $prop->getDefaultValue());
if (is_object($def)) {
$item = static::from($def);
} elseif ($def === null && !Nette\Utils\Validators::is(null, $type)) {
@@ -91,6 +85,8 @@ final class Expect
} else {
$item->default($def);
}
+ } else {
+ $item->required();
}
}
}
@@ -99,20 +95,13 @@ final class Expect
}
- /**
- * @param string|Schema $valueType
- * @param string|Schema|null $keyType
- */
- public static function arrayOf($valueType, $keyType = null): Type
+ public static function arrayOf(string|Schema $valueType, string|Schema $keyType = null): Type
{
return (new Type('array'))->items($valueType, $keyType);
}
- /**
- * @param string|Schema $type
- */
- public static function listOf($type): Type
+ public static function listOf(string|Schema $type): Type
{
return (new Type('list'))->items($type);
}
diff --git a/vendor/nette/schema/src/Schema/Helpers.php b/vendor/nette/schema/src/Schema/Helpers.php
index 3b653221..70bf1836 100644
--- a/vendor/nette/schema/src/Schema/Helpers.php
+++ b/vendor/nette/schema/src/Schema/Helpers.php
@@ -21,14 +21,12 @@ final class Helpers
use Nette\StaticClass;
public const PreventMerging = '_prevent_merging';
- public const PREVENT_MERGING = self::PreventMerging;
/**
* Merges dataset. Left has higher priority than right one.
- * @return array|string
*/
- public static function merge($value, $base)
+ public static function merge(mixed $value, mixed $base): mixed
{
if (is_array($value) && isset($value[self::PreventMerging])) {
unset($value[self::PreventMerging]);
@@ -57,17 +55,16 @@ final class Helpers
}
- public static function getPropertyType(\ReflectionProperty $prop): ?string
+ public static function getPropertyType(\ReflectionProperty|\ReflectionParameter $prop): ?string
{
- if (!class_exists(Nette\Utils\Type::class)) {
- throw new Nette\NotSupportedException('Expect::from() requires nette/utils 3.x');
- } elseif ($type = Nette\Utils\Type::fromReflection($prop)) {
+ if ($type = Nette\Utils\Type::fromReflection($prop)) {
return (string) $type;
- } elseif ($type = preg_replace('#\s.*#', '', (string) self::parseAnnotation($prop, 'var'))) {
+ } elseif (
+ ($prop instanceof \ReflectionProperty)
+ && ($type = preg_replace('#\s.*#', '', (string) self::parseAnnotation($prop, 'var')))
+ ) {
$class = Reflection::getPropertyDeclaringClass($prop);
- return preg_replace_callback('#[\w\\\\]+#', function ($m) use ($class) {
- return Reflection::expandClassName($m[0], $class);
- }, $type);
+ return preg_replace_callback('#[\w\\\\]+#', fn($m) => Reflection::expandClassName($m[0], $class), $type);
}
return null;
@@ -93,24 +90,23 @@ final class Helpers
}
- /**
- * @param mixed $value
- */
- public static function formatValue($value): string
+ public static function formatValue(mixed $value): string
{
- if (is_object($value)) {
- return 'object ' . get_class($value);
+ if ($value instanceof DynamicParameter) {
+ return 'dynamic';
+ } elseif (is_object($value)) {
+ return 'object ' . $value::class;
} elseif (is_string($value)) {
return "'" . Nette\Utils\Strings::truncate($value, 15, '...') . "'";
} elseif (is_scalar($value)) {
- return var_export($value, true);
+ return var_export($value, return: true);
} else {
- return strtolower(gettype($value));
+ return get_debug_type($value);
}
}
- public static function validateType($value, string $expected, Context $context): void
+ public static function validateType(mixed $value, string $expected, Context $context): void
{
if (!Nette\Utils\Validators::is($value, $expected)) {
$expected = str_replace(DynamicParameter::class . '|', '', $expected);
@@ -118,13 +114,13 @@ final class Helpers
$context->addError(
'The %label% %path% expects to be %expected%, %value% given.',
Message::TypeMismatch,
- ['value' => $value, 'expected' => $expected]
+ ['value' => $value, 'expected' => $expected],
);
}
}
- public static function validateRange($value, array $range, Context $context, string $types = ''): void
+ public static function validateRange(mixed $value, array $range, Context $context, string $types = ''): void
{
if (is_array($value) || is_string($value)) {
[$length, $label] = is_array($value)
@@ -137,20 +133,20 @@ final class Helpers
$context->addError(
"The length of %label% %path% expects to be in range %expected%, %length% $label given.",
Message::LengthOutOfRange,
- ['value' => $value, 'length' => $length, 'expected' => implode('..', $range)]
+ ['value' => $value, 'length' => $length, 'expected' => implode('..', $range)],
);
}
} elseif ((is_int($value) || is_float($value)) && !self::isInRange($value, $range)) {
$context->addError(
'The %label% %path% expects to be in range %expected%, %value% given.',
Message::ValueOutOfRange,
- ['value' => $value, 'expected' => implode('..', $range)]
+ ['value' => $value, 'expected' => implode('..', $range)],
);
}
}
- public static function isInRange($value, array $range): bool
+ public static function isInRange(mixed $value, array $range): bool
{
return ($range[0] === null || $value >= $range[0])
&& ($range[1] === null || $value <= $range[1]);
@@ -163,7 +159,7 @@ final class Helpers
$context->addError(
"The %label% %path% expects to match pattern '%pattern%', %value% given.",
Message::PatternMismatch,
- ['value' => $value, 'pattern' => $pattern]
+ ['value' => $value, 'pattern' => $pattern],
);
}
}
@@ -177,22 +173,11 @@ final class Helpers
return $value;
};
} elseif (method_exists($type, '__construct')) {
- return static function ($value) use ($type) {
- if (PHP_VERSION_ID < 80000 && is_array($value)) {
- throw new Nette\NotSupportedException("Creating $type objects is supported since PHP 8.0");
- }
- return is_array($value)
- ? new $type(...$value)
- : new $type($value);
- };
+ return static fn($value) => is_array($value) || $value instanceof \stdClass
+ ? new $type(...(array) $value)
+ : new $type($value);
} else {
- return static function ($value) use ($type) {
- $object = new $type;
- foreach ($value as $k => $v) {
- $object->$k = $v;
- }
- return $object;
- };
+ return static fn($value) => Nette\Utils\Arrays::toObject((array) $value, new $type);
}
}
}
diff --git a/vendor/nette/schema/src/Schema/Message.php b/vendor/nette/schema/src/Schema/Message.php
index 6f7c2ecc..4e976d03 100644
--- a/vendor/nette/schema/src/Schema/Message.php
+++ b/vendor/nette/schema/src/Schema/Message.php
@@ -14,8 +14,6 @@ use Nette;
final class Message
{
- use Nette\SmartObject;
-
/** variables: {value: mixed, expected: string} */
public const TypeMismatch = 'schema.typeMismatch';
@@ -40,27 +38,38 @@ final class Message
/** no variables */
public const Deprecated = 'schema.deprecated';
- /** Deprecated */
+ /** @deprecated use Message::TypeMismatch */
public const TYPE_MISMATCH = self::TypeMismatch;
+
+ /** @deprecated use Message::ValueOutOfRange */
public const VALUE_OUT_OF_RANGE = self::ValueOutOfRange;
+
+ /** @deprecated use Message::LengthOutOfRange */
public const LENGTH_OUT_OF_RANGE = self::LengthOutOfRange;
+
+ /** @deprecated use Message::PatternMismatch */
public const PATTERN_MISMATCH = self::PatternMismatch;
+
+ /** @deprecated use Message::FailedAssertion */
public const FAILED_ASSERTION = self::FailedAssertion;
+
+ /** @deprecated use Message::MissingItem */
public const MISSING_ITEM = self::MissingItem;
+
+ /** @deprecated use Message::UnexpectedItem */
public const UNEXPECTED_ITEM = self::UnexpectedItem;
+
+ /** @deprecated use Message::Deprecated */
public const DEPRECATED = self::Deprecated;
- /** @var string */
- public $message;
-
- /** @var string */
- public $code;
+ public string $message;
+ public string $code;
/** @var string[] */
- public $path;
+ public array $path;
/** @var string[] */
- public $variables;
+ public array $variables;
public function __construct(string $message, string $code, array $path, array $variables = [])
@@ -84,6 +93,6 @@ final class Message
return preg_replace_callback('~( ?)%(\w+)%~', function ($m) use ($vars) {
[, $space, $key] = $m;
return $vars[$key] === null ? '' : $space . $vars[$key];
- }, $this->message);
+ }, $this->message) ?? throw new Nette\InvalidStateException(preg_last_error_msg());
}
}
diff --git a/vendor/nette/schema/src/Schema/Processor.php b/vendor/nette/schema/src/Schema/Processor.php
index a10a0ef6..3290ba60 100644
--- a/vendor/nette/schema/src/Schema/Processor.php
+++ b/vendor/nette/schema/src/Schema/Processor.php
@@ -17,19 +17,12 @@ use Nette;
*/
final class Processor
{
- use Nette\SmartObject;
-
- /** @var array */
- public $onNewContext = [];
-
- /** @var Context|null */
- private $context;
-
- /** @var bool */
- private $skipDefaults;
+ public array $onNewContext = [];
+ private Context $context;
+ private bool $skipDefaults = false;
- public function skipDefaults(bool $value = true)
+ public function skipDefaults(bool $value = true): void
{
$this->skipDefaults = $value;
}
@@ -37,10 +30,9 @@ final class Processor
/**
* Normalizes and validates data. Result is a clean completed data.
- * @return mixed
* @throws ValidationException
*/
- public function process(Schema $schema, $data)
+ public function process(Schema $schema, mixed $data): mixed
{
$this->createContext();
$data = $schema->normalize($data, $this->context);
@@ -53,10 +45,9 @@ final class Processor
/**
* Normalizes and validates and merges multiple data. Result is a clean completed data.
- * @return mixed
* @throws ValidationException
*/
- public function processMultiple(Schema $schema, array $dataset)
+ public function processMultiple(Schema $schema, array $dataset): mixed
{
$this->createContext();
$flatten = null;
@@ -96,10 +87,10 @@ final class Processor
}
- private function createContext()
+ private function createContext(): void
{
$this->context = new Context;
$this->context->skipDefaults = $this->skipDefaults;
- $this->onNewContext($this->context);
+ Nette\Utils\Arrays::invoke($this->onNewContext, $this->context);
}
}
diff --git a/vendor/nette/schema/src/Schema/Schema.php b/vendor/nette/schema/src/Schema/Schema.php
index bbd8bd09..3ded7698 100644
--- a/vendor/nette/schema/src/Schema/Schema.php
+++ b/vendor/nette/schema/src/Schema/Schema.php
@@ -16,19 +16,19 @@ interface Schema
* Normalization.
* @return mixed
*/
- function normalize($value, Context $context);
+ function normalize(mixed $value, Context $context);
/**
* Merging.
* @return mixed
*/
- function merge($value, $base);
+ function merge(mixed $value, mixed $base);
/**
* Validation and finalization.
* @return mixed
*/
- function complete($value, Context $context);
+ function complete(mixed $value, Context $context);
/**
* @return mixed
diff --git a/vendor/nette/schema/src/Schema/ValidationException.php b/vendor/nette/schema/src/Schema/ValidationException.php
index 04c581f9..caae0be4 100644
--- a/vendor/nette/schema/src/Schema/ValidationException.php
+++ b/vendor/nette/schema/src/Schema/ValidationException.php
@@ -18,7 +18,7 @@ use Nette;
class ValidationException extends Nette\InvalidStateException
{
/** @var Message[] */
- private $messages;
+ private array $messages;
/**
diff --git a/vendor/phpunit/phpunit/ChangeLog-10.5.md b/vendor/phpunit/phpunit/ChangeLog-10.5.md
index 067699db..a71f09ac 100644
--- a/vendor/phpunit/phpunit/ChangeLog-10.5.md
+++ b/vendor/phpunit/phpunit/ChangeLog-10.5.md
@@ -2,6 +2,12 @@
All notable changes of the PHPUnit 10.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
+## [10.5.9] - 2024-01-22
+
+### Fixed
+
+* [#5676](https://github.com/sebastianbergmann/phpunit/issues/5676): PHPUnit's test runner overwrites custom error handler registered using `set_error_handler()` in bootstrap script
+
## [10.5.8] - 2024-01-19
### Fixed
@@ -91,6 +97,7 @@ All notable changes of the PHPUnit 10.5 release series are documented in this fi
* [#5563](https://github.com/sebastianbergmann/phpunit/issues/5563): `createMockForIntersectionOfInterfaces()` does not automatically register mock object for expectation verification
+[10.5.9]: https://github.com/sebastianbergmann/phpunit/compare/10.5.8...10.5.9
[10.5.8]: https://github.com/sebastianbergmann/phpunit/compare/10.5.7...10.5.8
[10.5.7]: https://github.com/sebastianbergmann/phpunit/compare/10.5.6...10.5.7
[10.5.6]: https://github.com/sebastianbergmann/phpunit/compare/10.5.5...10.5.6
diff --git a/vendor/phpunit/phpunit/src/Runner/ErrorHandler.php b/vendor/phpunit/phpunit/src/Runner/ErrorHandler.php
index ea3acfa5..e1c5b8a7 100644
--- a/vendor/phpunit/phpunit/src/Runner/ErrorHandler.php
+++ b/vendor/phpunit/phpunit/src/Runner/ErrorHandler.php
@@ -166,7 +166,13 @@ final class ErrorHandler
return;
}
- set_error_handler($this);
+ $oldErrorHandler = set_error_handler($this);
+
+ if ($oldErrorHandler !== null) {
+ restore_error_handler();
+
+ return;
+ }
$this->enabled = true;
$this->originalErrorReportingLevel = error_reporting();
diff --git a/vendor/phpunit/phpunit/src/Runner/Version.php b/vendor/phpunit/phpunit/src/Runner/Version.php
index c93a7b7d..59ddf150 100644
--- a/vendor/phpunit/phpunit/src/Runner/Version.php
+++ b/vendor/phpunit/phpunit/src/Runner/Version.php
@@ -34,7 +34,7 @@ final class Version
}
if (self::$version === '') {
- self::$version = (new VersionId('10.5.8', dirname(__DIR__, 2)))->asString();
+ self::$version = (new VersionId('10.5.9', dirname(__DIR__, 2)))->asString();
}
return self::$version;
diff --git a/vendor/phpunit/phpunit/src/TextUI/Help.php b/vendor/phpunit/phpunit/src/TextUI/Help.php
index e09c172b..4eb638b1 100644
--- a/vendor/phpunit/phpunit/src/TextUI/Help.php
+++ b/vendor/phpunit/phpunit/src/TextUI/Help.php
@@ -11,6 +11,7 @@ namespace PHPUnit\TextUI;
use const PHP_EOL;
use function count;
+use function defined;
use function explode;
use function max;
use function preg_replace_callback;
@@ -26,144 +27,7 @@ use SebastianBergmann\Environment\Console;
*/
final class Help
{
- private const LEFT_MARGIN = ' ';
- private const HELP_TEXT = [
- 'Usage' => [
- ['text' => 'phpunit [options]