Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

[TwigBridge] Remove $rootDir argument in CodeExtension#28967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
fabpot merged 1 commit intosymfony:masterfromro0NL:root_dir
Oct 25, 2018
Merged

[TwigBridge] Remove $rootDir argument in CodeExtension#28967

fabpot merged 1 commit intosymfony:masterfromro0NL:root_dir
Oct 25, 2018

Conversation

@ro0NL
Copy link
Contributor

QA
Branch?master
Bug fix?yes
New feature?no
BC breaks?no
Deprecations?no
Tests pass?yes
Fixed ticketssymfony/symfony-docs#10547 (comment)
LicenseMIT
Doc PRsymfony/symfony-docs#...

Forgotten in#28890

cc@javiereguiluz

* @param string $charset The charset
*/
publicfunction__construct($fileLinkFormat,string$rootDir,string$charset,string$projectDir =null)
publicfunction__construct($fileLinkFormat,string$projectDir,string$charset)
Copy link
ContributorAuthor

@ro0NLro0NLOct 24, 2018•
edited
Loading

Choose a reason for hiding this comment

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

argument was added in 4.2, so safe to remove technically.

We slightly change the behavior, only in formatFile. IMHO that's fine.

@chalasrchalasr added this to the4.2 milestoneOct 24, 2018
@nicolas-grekas
Copy link
Member

can you have a look at the failure on Windows?

-'some/File.txt'+'/some/File.txt'C:\projects\symfony\src\Symfony\Bridge\Twig\Tests\Extension\CodeExtensionTest.php:28

@nicolas-grekas
Copy link
Member

and the failure on Travis btw - looks like the composer.json change allowed spotting an issue :)

@ro0NL
Copy link
ContributorAuthor

ro0NL commentedOct 24, 2018•
edited
Loading

Im not sure the appveyor failure is still related, looks like it's not.

@ro0NL
Copy link
ContributorAuthor

TheCodeHelper looks like

publicfunction__construct($fileLinkFormat,string$projectDir,string$charset)
{
$this->fileLinkFormat =$fileLinkFormat ?:ini_get('xdebug.file_link_format') ?:get_cfg_var('xdebug.file_link_format');
$this->rootDir =str_replace('\\','/',$projectDir).'/';
$this->charset =$charset;
}

so i tend to keep the slash normalization actually =/

@fabpot
Copy link
Member

Thank you@ro0NL.

@fabpotfabpot merged commitf894724 intosymfony:masterOct 25, 2018
fabpot added a commit that referenced this pull requestOct 25, 2018
…0NL)This PR was merged into the 4.2-dev branch.Discussion---------- [TwigBridge] Remove $rootDir argument in CodeExtension| Q             | A| ------------- | ---| Branch?       | master| Bug fix?      | yes| New feature?  | no| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->| Fixed tickets |symfony/symfony-docs#10547 (comment)| License       | MIT| Doc PR        | symfony/symfony-docs#... <!-- required for new features -->Forgotten in#28890cc@javiereguiluzCommits-------f894724 [TwigBridge] Remove $rootDir argument in CodeExtension
@ro0NLro0NL deleted the root_dir branchOctober 25, 2018 16:06
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@fabpotfabpotfabpot approved these changes

+1 more reviewer

@TobionTobionTobion approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Projects

None yet

Milestone

4.2

Development

Successfully merging this pull request may close these issues.

6 participants

@ro0NL@nicolas-grekas@fabpot@Tobion@chalasr@carsonbot
[8]ページ先頭
©2009-2025 Movatter.jp