Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions src/StringHelper.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,29 +56,26 @@ public static function increment($string, $style = 'default', $n = 0)
{
$styleSpec = static::$incrementStyles[$style] ?? static::$incrementStyles['default'];

// Regular expression search and replace patterns.
if (\is_array($styleSpec[0])) {
$rxSearch = $styleSpec[0][0];
$rxReplace = $styleSpec[0][1];
} else {
$rxSearch = $rxReplace = $styleSpec[0];
}

// New and old (existing) sprintf formats.
if (\is_array($styleSpec[1])) {
$newFormat = $styleSpec[1][0];
$oldFormat = $styleSpec[1][1];
} else {
$newFormat = $oldFormat = $styleSpec[1];
}

// Check if we are incrementing an existing pattern, or appending a new one.
if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($oldFormat, $n), $string);
// Regular expression search and replace patterns for both cases
if ($style === 'dash') {
$rxSearch = '#-(\d+)$#'; // Match the trailing number after a hyphen (e.g., "dog-2")
$rxReplace = '-%d'; // Replace it with "-number"

if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($rxReplace, $n), $string);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll get an error here, you are replacing the n (value number) in the replacement string "-%d" which is not a valid replacement string for the preg_replace function, because it doesn't have the required delimiter -.

Your code will work, and replace report-2025 with report-2025-2, how it works?
Because, when it gets the error I mentioned, it will result in an empty string
Then when the empty alias reaches Content.php it will enter here
if (trim($this->alias) == '') { $this->alias = $this->title; }
Now the alias is typical as the title, lets say the title is report 2025 (2)

This following method will make behave the alias to be a safe URL, i.e. it will remove spaces and brackets and replace them with hyphen so report 2025 (2) will be report-2025-2
$this->alias = ApplicationHelper::stringURLSafe($this->alias, $this->language);

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing that out! Looking for some better solution. Will revert back soon!

} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($rxReplace, $n);
}
} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($newFormat, $n);
if (preg_match('#\((\d+)\)$#', $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace('#\((\d+)\)$#', "($n)", $string);
} else {
$n = empty($n) ? 2 : $n;
$string .= " ($n)";
}
}

return $string;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Refactor alias and title increment logic in StringHelper by charvimehradu · Pull Request #53 · joomla-framework/string · GitHub
Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions src/StringHelper.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,29 +56,26 @@ public static function increment($string, $style = 'default', $n = 0)
{
$styleSpec = static::$incrementStyles[$style] ?? static::$incrementStyles['default'];

// Regular expression search and replace patterns.
if (\is_array($styleSpec[0])) {
$rxSearch = $styleSpec[0][0];
$rxReplace = $styleSpec[0][1];
} else {
$rxSearch = $rxReplace = $styleSpec[0];
}

// New and old (existing) sprintf formats.
if (\is_array($styleSpec[1])) {
$newFormat = $styleSpec[1][0];
$oldFormat = $styleSpec[1][1];
} else {
$newFormat = $oldFormat = $styleSpec[1];
}

// Check if we are incrementing an existing pattern, or appending a new one.
if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($oldFormat, $n), $string);
// Regular expression search and replace patterns for both cases
if ($style === 'dash') {
$rxSearch = '#-(\d+)$#'; // Match the trailing number after a hyphen (e.g., "dog-2")
$rxReplace = '-%d'; // Replace it with "-number"

if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($rxReplace, $n), $string);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll get an error here, you are replacing the n (value number) in the replacement string "-%d" which is not a valid replacement string for the preg_replace function, because it doesn't have the required delimiter -.

Your code will work, and replace report-2025 with report-2025-2, how it works?
Because, when it gets the error I mentioned, it will result in an empty string
Then when the empty alias reaches Content.php it will enter here
if (trim($this->alias) == '') { $this->alias = $this->title; }
Now the alias is typical as the title, lets say the title is report 2025 (2)

This following method will make behave the alias to be a safe URL, i.e. it will remove spaces and brackets and replace them with hyphen so report 2025 (2) will be report-2025-2
$this->alias = ApplicationHelper::stringURLSafe($this->alias, $this->language);

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing that out! Looking for some better solution. Will revert back soon!

} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($rxReplace, $n);
}
} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($newFormat, $n);
if (preg_match('#\((\d+)\)$#', $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace('#\((\d+)\)$#', "($n)", $string);
} else {
$n = empty($n) ? 2 : $n;
$string .= " ($n)";
}
}

return $string;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Refactor alias and title increment logic in StringHelper by charvimehradu · Pull Request #53 · joomla-framework/string · GitHub
Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions src/StringHelper.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,29 +56,26 @@ public static function increment($string, $style = 'default', $n = 0)
{
$styleSpec = static::$incrementStyles[$style] ?? static::$incrementStyles['default'];

// Regular expression search and replace patterns.
if (\is_array($styleSpec[0])) {
$rxSearch = $styleSpec[0][0];
$rxReplace = $styleSpec[0][1];
} else {
$rxSearch = $rxReplace = $styleSpec[0];
}

// New and old (existing) sprintf formats.
if (\is_array($styleSpec[1])) {
$newFormat = $styleSpec[1][0];
$oldFormat = $styleSpec[1][1];
} else {
$newFormat = $oldFormat = $styleSpec[1];
}

// Check if we are incrementing an existing pattern, or appending a new one.
if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($oldFormat, $n), $string);
// Regular expression search and replace patterns for both cases
if ($style === 'dash') {
$rxSearch = '#-(\d+)$#'; // Match the trailing number after a hyphen (e.g., "dog-2")
$rxReplace = '-%d'; // Replace it with "-number"

if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($rxReplace, $n), $string);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll get an error here, you are replacing the n (value number) in the replacement string "-%d" which is not a valid replacement string for the preg_replace function, because it doesn't have the required delimiter -.

Your code will work, and replace report-2025 with report-2025-2, how it works?
Because, when it gets the error I mentioned, it will result in an empty string
Then when the empty alias reaches Content.php it will enter here
if (trim($this->alias) == '') { $this->alias = $this->title; }
Now the alias is typical as the title, lets say the title is report 2025 (2)

This following method will make behave the alias to be a safe URL, i.e. it will remove spaces and brackets and replace them with hyphen so report 2025 (2) will be report-2025-2
$this->alias = ApplicationHelper::stringURLSafe($this->alias, $this->language);

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing that out! Looking for some better solution. Will revert back soon!

} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($rxReplace, $n);
}
} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($newFormat, $n);
if (preg_match('#\((\d+)\)$#', $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace('#\((\d+)\)$#', "($n)", $string);
} else {
$n = empty($n) ? 2 : $n;
$string .= " ($n)";
}
}

return $string;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Refactor alias and title increment logic in StringHelper by charvimehradu · Pull Request #53 · joomla-framework/string · GitHub
Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions src/StringHelper.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,29 +56,26 @@ public static function increment($string, $style = 'default', $n = 0)
{
$styleSpec = static::$incrementStyles[$style] ?? static::$incrementStyles['default'];

// Regular expression search and replace patterns.
if (\is_array($styleSpec[0])) {
$rxSearch = $styleSpec[0][0];
$rxReplace = $styleSpec[0][1];
} else {
$rxSearch = $rxReplace = $styleSpec[0];
}

// New and old (existing) sprintf formats.
if (\is_array($styleSpec[1])) {
$newFormat = $styleSpec[1][0];
$oldFormat = $styleSpec[1][1];
} else {
$newFormat = $oldFormat = $styleSpec[1];
}

// Check if we are incrementing an existing pattern, or appending a new one.
if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($oldFormat, $n), $string);
// Regular expression search and replace patterns for both cases
if ($style === 'dash') {
$rxSearch = '#-(\d+)$#'; // Match the trailing number after a hyphen (e.g., "dog-2")
$rxReplace = '-%d'; // Replace it with "-number"

if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($rxReplace, $n), $string);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll get an error here, you are replacing the n (value number) in the replacement string "-%d" which is not a valid replacement string for the preg_replace function, because it doesn't have the required delimiter -.

Your code will work, and replace report-2025 with report-2025-2, how it works?
Because, when it gets the error I mentioned, it will result in an empty string
Then when the empty alias reaches Content.php it will enter here
if (trim($this->alias) == '') { $this->alias = $this->title; }
Now the alias is typical as the title, lets say the title is report 2025 (2)

This following method will make behave the alias to be a safe URL, i.e. it will remove spaces and brackets and replace them with hyphen so report 2025 (2) will be report-2025-2
$this->alias = ApplicationHelper::stringURLSafe($this->alias, $this->language);

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing that out! Looking for some better solution. Will revert back soon!

} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($rxReplace, $n);
}
} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($newFormat, $n);
if (preg_match('#\((\d+)\)$#', $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace('#\((\d+)\)$#', "($n)", $string);
} else {
$n = empty($n) ? 2 : $n;
$string .= " ($n)";
}
}

return $string;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Refactor alias and title increment logic in StringHelper by charvimehradu · Pull Request #53 · joomla-framework/string · GitHub
Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions src/StringHelper.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,29 +56,26 @@ public static function increment($string, $style = 'default', $n = 0)
{
$styleSpec = static::$incrementStyles[$style] ?? static::$incrementStyles['default'];

// Regular expression search and replace patterns.
if (\is_array($styleSpec[0])) {
$rxSearch = $styleSpec[0][0];
$rxReplace = $styleSpec[0][1];
} else {
$rxSearch = $rxReplace = $styleSpec[0];
}

// New and old (existing) sprintf formats.
if (\is_array($styleSpec[1])) {
$newFormat = $styleSpec[1][0];
$oldFormat = $styleSpec[1][1];
} else {
$newFormat = $oldFormat = $styleSpec[1];
}

// Check if we are incrementing an existing pattern, or appending a new one.
if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($oldFormat, $n), $string);
// Regular expression search and replace patterns for both cases
if ($style === 'dash') {
$rxSearch = '#-(\d+)$#'; // Match the trailing number after a hyphen (e.g., "dog-2")
$rxReplace = '-%d'; // Replace it with "-number"

if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($rxReplace, $n), $string);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll get an error here, you are replacing the n (value number) in the replacement string "-%d" which is not a valid replacement string for the preg_replace function, because it doesn't have the required delimiter -.

Your code will work, and replace report-2025 with report-2025-2, how it works?
Because, when it gets the error I mentioned, it will result in an empty string
Then when the empty alias reaches Content.php it will enter here
if (trim($this->alias) == '') { $this->alias = $this->title; }
Now the alias is typical as the title, lets say the title is report 2025 (2)

This following method will make behave the alias to be a safe URL, i.e. it will remove spaces and brackets and replace them with hyphen so report 2025 (2) will be report-2025-2
$this->alias = ApplicationHelper::stringURLSafe($this->alias, $this->language);

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing that out! Looking for some better solution. Will revert back soon!

} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($rxReplace, $n);
}
} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($newFormat, $n);
if (preg_match('#\((\d+)\)$#', $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace('#\((\d+)\)$#', "($n)", $string);
} else {
$n = empty($n) ? 2 : $n;
$string .= " ($n)";
}
}

return $string;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Refactor alias and title increment logic in StringHelper by charvimehradu · Pull Request #53 · joomla-framework/string · GitHub
Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions src/StringHelper.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,29 +56,26 @@ public static function increment($string, $style = 'default', $n = 0)
{
$styleSpec = static::$incrementStyles[$style] ?? static::$incrementStyles['default'];

// Regular expression search and replace patterns.
if (\is_array($styleSpec[0])) {
$rxSearch = $styleSpec[0][0];
$rxReplace = $styleSpec[0][1];
} else {
$rxSearch = $rxReplace = $styleSpec[0];
}

// New and old (existing) sprintf formats.
if (\is_array($styleSpec[1])) {
$newFormat = $styleSpec[1][0];
$oldFormat = $styleSpec[1][1];
} else {
$newFormat = $oldFormat = $styleSpec[1];
}

// Check if we are incrementing an existing pattern, or appending a new one.
if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($oldFormat, $n), $string);
// Regular expression search and replace patterns for both cases
if ($style === 'dash') {
$rxSearch = '#-(\d+)$#'; // Match the trailing number after a hyphen (e.g., "dog-2")
$rxReplace = '-%d'; // Replace it with "-number"

if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($rxReplace, $n), $string);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll get an error here, you are replacing the n (value number) in the replacement string "-%d" which is not a valid replacement string for the preg_replace function, because it doesn't have the required delimiter -.

Your code will work, and replace report-2025 with report-2025-2, how it works?
Because, when it gets the error I mentioned, it will result in an empty string
Then when the empty alias reaches Content.php it will enter here
if (trim($this->alias) == '') { $this->alias = $this->title; }
Now the alias is typical as the title, lets say the title is report 2025 (2)

This following method will make behave the alias to be a safe URL, i.e. it will remove spaces and brackets and replace them with hyphen so report 2025 (2) will be report-2025-2
$this->alias = ApplicationHelper::stringURLSafe($this->alias, $this->language);

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing that out! Looking for some better solution. Will revert back soon!

} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($rxReplace, $n);
}
} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($newFormat, $n);
if (preg_match('#\((\d+)\)$#', $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace('#\((\d+)\)$#', "($n)", $string);
} else {
$n = empty($n) ? 2 : $n;
$string .= " ($n)";
}
}

return $string;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Refactor alias and title increment logic in StringHelper by charvimehradu · Pull Request #53 · joomla-framework/string · GitHub
Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions src/StringHelper.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,29 +56,26 @@ public static function increment($string, $style = 'default', $n = 0)
{
$styleSpec = static::$incrementStyles[$style] ?? static::$incrementStyles['default'];

// Regular expression search and replace patterns.
if (\is_array($styleSpec[0])) {
$rxSearch = $styleSpec[0][0];
$rxReplace = $styleSpec[0][1];
} else {
$rxSearch = $rxReplace = $styleSpec[0];
}

// New and old (existing) sprintf formats.
if (\is_array($styleSpec[1])) {
$newFormat = $styleSpec[1][0];
$oldFormat = $styleSpec[1][1];
} else {
$newFormat = $oldFormat = $styleSpec[1];
}

// Check if we are incrementing an existing pattern, or appending a new one.
if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($oldFormat, $n), $string);
// Regular expression search and replace patterns for both cases
if ($style === 'dash') {
$rxSearch = '#-(\d+)$#'; // Match the trailing number after a hyphen (e.g., "dog-2")
$rxReplace = '-%d'; // Replace it with "-number"

if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($rxReplace, $n), $string);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll get an error here, you are replacing the n (value number) in the replacement string "-%d" which is not a valid replacement string for the preg_replace function, because it doesn't have the required delimiter -.

Your code will work, and replace report-2025 with report-2025-2, how it works?
Because, when it gets the error I mentioned, it will result in an empty string
Then when the empty alias reaches Content.php it will enter here
if (trim($this->alias) == '') { $this->alias = $this->title; }
Now the alias is typical as the title, lets say the title is report 2025 (2)

This following method will make behave the alias to be a safe URL, i.e. it will remove spaces and brackets and replace them with hyphen so report 2025 (2) will be report-2025-2
$this->alias = ApplicationHelper::stringURLSafe($this->alias, $this->language);

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing that out! Looking for some better solution. Will revert back soon!

} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($rxReplace, $n);
}
} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($newFormat, $n);
if (preg_match('#\((\d+)\)$#', $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace('#\((\d+)\)$#', "($n)", $string);
} else {
$n = empty($n) ? 2 : $n;
$string .= " ($n)";
}
}

return $string;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Refactor alias and title increment logic in StringHelper by charvimehradu · Pull Request #53 · joomla-framework/string · GitHub
Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions src/StringHelper.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,29 +56,26 @@ public static function increment($string, $style = 'default', $n = 0)
{
$styleSpec = static::$incrementStyles[$style] ?? static::$incrementStyles['default'];

// Regular expression search and replace patterns.
if (\is_array($styleSpec[0])) {
$rxSearch = $styleSpec[0][0];
$rxReplace = $styleSpec[0][1];
} else {
$rxSearch = $rxReplace = $styleSpec[0];
}

// New and old (existing) sprintf formats.
if (\is_array($styleSpec[1])) {
$newFormat = $styleSpec[1][0];
$oldFormat = $styleSpec[1][1];
} else {
$newFormat = $oldFormat = $styleSpec[1];
}

// Check if we are incrementing an existing pattern, or appending a new one.
if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($oldFormat, $n), $string);
// Regular expression search and replace patterns for both cases
if ($style === 'dash') {
$rxSearch = '#-(\d+)$#'; // Match the trailing number after a hyphen (e.g., "dog-2")
$rxReplace = '-%d'; // Replace it with "-number"

if (preg_match($rxSearch, $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace($rxReplace, sprintf($rxReplace, $n), $string);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll get an error here, you are replacing the n (value number) in the replacement string "-%d" which is not a valid replacement string for the preg_replace function, because it doesn't have the required delimiter -.

Your code will work, and replace report-2025 with report-2025-2, how it works?
Because, when it gets the error I mentioned, it will result in an empty string
Then when the empty alias reaches Content.php it will enter here
if (trim($this->alias) == '') { $this->alias = $this->title; }
Now the alias is typical as the title, lets say the title is report 2025 (2)

This following method will make behave the alias to be a safe URL, i.e. it will remove spaces and brackets and replace them with hyphen so report 2025 (2) will be report-2025-2
$this->alias = ApplicationHelper::stringURLSafe($this->alias, $this->language);

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing that out! Looking for some better solution. Will revert back soon!

} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($rxReplace, $n);
}
} else {
$n = empty($n) ? 2 : $n;
$string .= sprintf($newFormat, $n);
if (preg_match('#\((\d+)\)$#', $string, $matches)) {
$n = empty($n) ? ($matches[1] + 1) : $n;
$string = preg_replace('#\((\d+)\)$#', "($n)", $string);
} else {
$n = empty($n) ? 2 : $n;
$string .= " ($n)";
}
}

return $string;
Expand Down