From bd73e3338156af98b8e2f9ae66e0fb47555c51e6 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Thu, 4 Mar 2021 18:34:48 +0100 Subject: [PATCH 1/4] updated ecs.php --- ecs.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ecs.php b/ecs.php index 9bd422637..6dcae54a5 100644 --- a/ecs.php +++ b/ecs.php @@ -14,8 +14,18 @@ $parameters = $containerConfigurator->parameters(); $parameters->set('skip', [ + 'tmp/*', + 'fixtures*/*', + PhpCsFixer\Fixer\ClassNotation\OrderedClassElementsFixer::class => [ 'src/Tracy/Debugger/Debugger.php', ], + + // dump() + Drew\DebugStatementsFixers\Dump::class => [ + 'tests/Tracy/dump().cli.phpt', + 'tests/Tracy/dump().html.phpt', + 'tests/Tracy/dump().text.phpt', + ], ]); }; From 0c13775ea0d3b681ae1d9bea59ed94029a96c09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Bar=C3=A1=C5=A1ek?= Date: Mon, 8 Mar 2021 15:54:01 +0100 Subject: [PATCH 2/4] Bluescreen: Add selection color (#471) --- src/Tracy/BlueScreen/assets/bluescreen.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Tracy/BlueScreen/assets/bluescreen.css b/src/Tracy/BlueScreen/assets/bluescreen.css index 0572dfd16..b142a4957 100644 --- a/src/Tracy/BlueScreen/assets/bluescreen.css +++ b/src/Tracy/BlueScreen/assets/bluescreen.css @@ -60,6 +60,12 @@ font-size: 13pt; } +#tracy-bs-error::selection, +#tracy-bs-error ::selection { + color: black !important; + background: #FDF5CE !important; +} + #tracy-bs-error a { color: #ffefa1 !important; } From c0f21d61bec95984470eeceee7d3e4496f3dee7f Mon Sep 17 00:00:00 2001 From: David Grudl Date: Thu, 11 Mar 2021 21:55:38 +0100 Subject: [PATCH 3/4] removed community health files --- .github/ISSUE_TEMPLATE/Bug_report.md | 19 ------------- .github/ISSUE_TEMPLATE/Feature_request.md | 9 ------ .github/ISSUE_TEMPLATE/Support_question.md | 12 -------- .github/ISSUE_TEMPLATE/Support_us.md | 21 -------------- .github/funding.yml | 1 - .github/pull_request_template.md | 11 -------- contributing.md | 33 ---------------------- 7 files changed, 106 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/Bug_report.md delete mode 100644 .github/ISSUE_TEMPLATE/Feature_request.md delete mode 100644 .github/ISSUE_TEMPLATE/Support_question.md delete mode 100644 .github/ISSUE_TEMPLATE/Support_us.md delete mode 100644 .github/funding.yml delete mode 100644 .github/pull_request_template.md delete mode 100644 contributing.md diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md deleted file mode 100644 index 72c78b608..000000000 --- a/.github/ISSUE_TEMPLATE/Bug_report.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: "🐛 Bug Report" -about: "If something isn't working as expected 🤔" - ---- - -Version: ?.?.? - -### Bug Description -... A clear and concise description of what the bug is. A good bug report shouldn't leave others needing to chase you up for more information. - -### Steps To Reproduce -... If possible a minimal demo of the problem ... - -### Expected Behavior -... A clear and concise description of what you expected to happen. - -### Possible Solution -... Only if you have suggestions on a fix for the bug diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md deleted file mode 100644 index f5744abad..000000000 --- a/.github/ISSUE_TEMPLATE/Feature_request.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: "🚀 Feature Request" -about: "I have a suggestion (and may want to implement it) 🙂" - ---- - -- Is your feature request related to a problem? Please describe. -- Explain your intentions. -- It's up to you to make a strong case to convince the project's developers of the merits of this feature. diff --git a/.github/ISSUE_TEMPLATE/Support_question.md b/.github/ISSUE_TEMPLATE/Support_question.md deleted file mode 100644 index 5a1dc6167..000000000 --- a/.github/ISSUE_TEMPLATE/Support_question.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -name: "🤗 Support Question" -about: "If you have a question 💬, please check out our forum!" - ---- - ---------------^ Click "Preview" for a nicer view! -We primarily use GitHub as an issue tracker; for usage and support questions, please check out these resources below. Thanks! 😁. - -* Tracy Forum: https://forum.nette.org/en/f46-tracy -* Tracy Gitter: https://gitter.im/nette/tracy -* Slack (czech): https://pehapkari.slack.com/messages/C2R30BLKA diff --git a/.github/ISSUE_TEMPLATE/Support_us.md b/.github/ISSUE_TEMPLATE/Support_us.md deleted file mode 100644 index 92d8a4c3a..000000000 --- a/.github/ISSUE_TEMPLATE/Support_us.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -name: "❤️ Support us" -about: "If you would like to support our efforts in maintaining this project 🙌" - ---- - ---------------^ Click "Preview" for a nicer view! - -> https://nette.org/donate - -Help support Nette! - -We develop Nette Framework for more than 14 years. In order to make your life more comfortable. Nette cares about the safety of your sites. Nette saves you time. And gives job opportunities. - -Nette earns you money. And is absolutely free. - -To ensure future development and improving the documentation, we need your donation. - -Whether you are chief of IT company which benefits from Nette, or developer who goes for advice on our forum, if you like Nette, [please make a donation now](https://nette.org/donate). - -Thank you! diff --git a/.github/funding.yml b/.github/funding.yml deleted file mode 100644 index 423e70030..000000000 --- a/.github/funding.yml +++ /dev/null @@ -1 +0,0 @@ -github: dg diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index f8aa3f408..000000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,11 +0,0 @@ -- bug fix / new feature? -- BC break? yes/no -- doc PR: nette/docs#??? - - diff --git a/contributing.md b/contributing.md deleted file mode 100644 index 184152c02..000000000 --- a/contributing.md +++ /dev/null @@ -1,33 +0,0 @@ -How to contribute & use the issue tracker -========================================= - -Nette welcomes your contributions. There are several ways to help out: - -* Create an issue on GitHub, if you have found a bug -* Write test cases for open bug issues -* Write fixes for open bug/feature issues, preferably with test cases included -* Contribute to the [documentation](https://nette.org/en/writing) - -Issues ------- - -Please **do not use the issue tracker to ask questions**. We will be happy to help you -on [Nette forum](https://forum.nette.org) or chat with us on [Gitter](https://gitter.im/nette/nette). - -A good bug report shouldn't leave others needing to chase you up for more -information. Please try to be as detailed as possible in your report. - -**Feature requests** are welcome. But take a moment to find out whether your idea -fits with the scope and aims of the project. It's up to *you* to make a strong -case to convince the project's developers of the merits of this feature. - -Contributing ------------- - -If you'd like to contribute, please take a moment to read [the contributing guide](https://nette.org/en/contributing). - -The best way to propose a feature is to discuss your ideas on [Nette forum](https://forum.nette.org) before implementing them. - -Please do not fix whitespace, format code, or make a purely cosmetic patch. - -Thanks! :heart: From 27ad8ba86df31f568603581068a925333e30f5d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20Dobe=C5=A1?= Date: Thu, 18 Mar 2021 09:57:51 +0100 Subject: [PATCH 4/4] Dumper: check also non-string keys for sensitivity --- src/Tracy/Dumper/Describer.php | 2 +- tests/Tracy/Dumper.scrubber.phpt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Tracy/Dumper/Describer.php b/src/Tracy/Dumper/Describer.php index 34e8e150e..758049ba8 100644 --- a/src/Tracy/Dumper/Describer.php +++ b/src/Tracy/Dumper/Describer.php @@ -172,7 +172,7 @@ private function describeArray(array $arr, int $depth = 0, int $refId = null) $refId = $this->getReferenceId($arr, $k); $items[] = [ $this->describeVar($k, $depth + 1), - is_string($k) && $this->isSensitive($k, $v) + $this->isSensitive(is_scalar($k) ? (string) $k : '', $v) ? new Value(Value::TYPE_TEXT, self::hideValue($v)) : $this->describeVar($v, $depth + 1, $refId), ] + ($refId ? [2 => $refId] : []); diff --git a/tests/Tracy/Dumper.scrubber.phpt b/tests/Tracy/Dumper.scrubber.phpt index c6adf92de..2f470ca13 100644 --- a/tests/Tracy/Dumper.scrubber.phpt +++ b/tests/Tracy/Dumper.scrubber.phpt @@ -122,4 +122,10 @@ Dumper::toText($arr, [Dumper::SCRUBBER => $scrubber]); Assert::same([ ['res', null], ['closure', null], + ['0', null], + ['0', null], + ['1', null], + ['1', null], + ['0', null], + ['1', null], ], $log);