Console table cleanup #19406

ReenExe · 2016-07-22T17:13:25Z

Q	A
Branch?	master
Bug fix?	yes `notice`
New feature?	no
BC breaks?	no
Deprecations?	no
Tests pass?	yes
Fixed tickets	-
License	MIT
Doc PR	-

xabbuh · 2016-07-23T05:57:15Z

src/Symfony/Component/Console/Helper/Table.php

-        if (!self::$styles[$name]) {
-            throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));
+        if (isset(self::$styles[$name])) {
+            return self::$styles[$name];


What is the advantage of this change?

$array = [ 'default' => new TableStyle(), ]; if (!$array['name']) { } // undefined offset 'name'

I'd keep the original order: throw, then return, which means changing this line to
if (empty(self::$styles[$name])) { (using empty() to keep throwing when defined but value is == false)

@nicolas-grekas, Done

@ReenExe did you forget to push?

@nicolas-grekas, now good? Or need change?
Sorry, hard understand what need change after last comment

yes, needs change to me

@nicolas-grekas, need add reviewed label?

but I don't see any change on the discussed line/code block, did you forget to push?

Yes, is my mistake
i extract method to resolveStyle

if ($name instanceof TableStyle) { return $name; } if (isset(self::$styles[$name])) { return self::$styles[$name]; } throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));

And in getStyleDefinition change

if (!self::$styles[$name]) { throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name)); } return self::$styles[$name];

to

if (isset(self::$styles[$name])) { return self::$styles[$name]; } throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));

But after review need changes to:

if (empty(self::$styles[$name])) { throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name)); } return self::$styles[$name];

So a think must be same code - and make same changes in both places

nicolas-grekas · 2016-07-28T06:55:38Z

src/Symfony/Component/Console/Tests/Helper/TableTest.php

@@ -694,6 +694,25 @@ public function testColumnWiths()
        $this->assertEquals($expected, $this->getOutputContent($output));
    }

+    /**
+     * @expectedException \InvalidArgumentException


\Symfony\Component\Console\Exception\InvalidArgumentException

nicolas-grekas · 2016-07-28T09:21:30Z

👍

fabpot · 2016-07-28T11:13:09Z

src/Symfony/Component/Console/Helper/Table.php

@@ -115,7 +115,7 @@ public static function getStyleDefinition($name)
            self::$styles = self::initStyles();
        }

-        if (!self::$styles[$name]) {
+        if (empty(self::$styles[$name])) {


Why not using isset() here?

By my suggestion: using isset would be written as:
if (isset(self::$styles[$name]) && !self::$styles[$name]) {
which happens to be exactly what empty() does.

When can the style be falsy?

I don't know :)

Reading the code, it looks like it is defined with an object or not defined at all. So, I think we should keep isset() as before in the new resolveStyle() method and change this one to use isset() as well. Whenever possible, I tend to avoid using empty().

@fabpot, before little change - what prefer?
1

if ($name instanceof TableStyle) { return $name; } if (!isset(self::$styles[$name])) { throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name)); } return self::$styles[$name];

or
2:

if ($name instanceof TableStyle) { return $name; } if (isset(self::$styles[$name])) { return self::$styles[$name]; } throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));

As for me is 2

fabpot · 2016-07-28T14:37:01Z

LGTM now. Can you submit another PR for Symfony 2.7 (keep this one open as it's going to be merged as well for more recent versions of Symfony)?

ReenExe · 2016-07-28T15:52:03Z

@fabpot, try with cherry-pick but have conflicts. Can i make new PR in 2.7 (arm move changes) and close this PR?

ReenExe · 2016-07-28T15:54:46Z

Also in 2.7

abcent method Table::setColumnStyle
Use \InvalidArgumentException instead \Symfony\...\InvalidArgumentException

nicolas-grekas · 2016-07-28T16:04:17Z

you should close this one yes, then open a new one against 2.7, then if you'd like another one against the first branch where setColumnStyle exists (and so on).

fabpot · 2016-07-28T16:10:49Z

No, please, don't close this one. @ReenExe You are right, that's why I need a specific PR for 2.7. This one will still be merged for the additional changes. Thanks.

ReenExe · 2016-07-28T16:13:19Z

@fabpot, i will try, but conflict stay between branches - it's normal?
In next time first changes make to 2.7 and next in master? (maybe miss some manual from Contributing)

fabpot · 2016-07-28T16:20:06Z

Just submit a PR on 2.7 and I will take care of merge conflict myself.

ReenExe · 2016-07-28T16:20:25Z

Make new PR - thats only covers bugfix #19470

ReenExe · 2016-07-28T16:25:48Z

@fabpot, i see this after try submit (make my branch from master)

This PR was squashed before being merged into the 2.7 branch (closes #19470). Discussion ---------- undefined offset fix (#19406) | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 9813888 undefined offset fix (#19406)

* 2.7: undefined offset fix (#19406) [EventDispatcher] Removed unused variable

fabpot · 2016-07-28T16:57:51Z

Thank you @ReenExe.

This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #19406). Discussion ---------- Console table cleanup | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes `notice` | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 217274b Console table cleanup

* 2.8: Minor fixes [Console] Overcomplete argument exception message tweak. fixed bad auto merge Console table cleanup undefined offset fix (#19406) [EventDispatcher] Removed unused variable

* 3.0: Minor fixes [Console] Overcomplete argument exception message tweak. fixed bad auto merge Console table cleanup undefined offset fix (#19406) [EventDispatcher] Removed unused variable

* 3.1: Minor fixes [Cache] Fix abstract AdapterTestCase cache property [Console] Overcomplete argument exception message tweak. fixed bad auto merge Console table cleanup undefined offset fix (#19406) [EventDispatcher] Removed unused variable

* 2.8: Relax 1 test failing with latest PHP versions bumped Symfony version to 2.8.10 Remove usage of __CLASS__ outside of a class [HttpKernel] Fix variable conflicting name [Process] Fix double-fread() when reading unix pipes [Process] Fix AbstractPipes::write() for a situation seen on HHVM (at least) [Validator] Fix dockblock typehint in XmlFileLoader bumped Symfony version to 2.8.10 updated VERSION for 2.8.9 updated CHANGELOG for 2.8.9 bumped Symfony version to 2.7.17 updated VERSION for 2.7.16 update CONTRIBUTORS for 2.7.16 updated CHANGELOG for 2.7.16 Minor fixes [Console] Overcomplete argument exception message tweak. fixed bad auto merge Console table cleanup undefined offset fix (#19406) [EventDispatcher] Removed unused variable Conflicts: CHANGELOG-2.7.md CHANGELOG-3.0.md src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php src/Symfony/Component/Console/Tests/Helper/TableTest.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/legacy-container9.php src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php src/Symfony/Component/HttpKernel/Kernel.php

ReenExe added 4 commits July 22, 2016 19:57

covers Console\Helper\Table style is not defined

e7991ae

move common code logic

993a77f

test before code -> covers Table::getStyleDefinition

c3647ec

fix notice (Undefined index: key)

db2010c

carsonbot added Status: Needs Review Bug labels Jul 22, 2016

xabbuh reviewed Jul 23, 2016
View reviewed changes

ReenExe added 2 commits July 25, 2016 20:02

use @expectedException and rename private method (after review #19406)

f1e68d0

same condition style

04283ac

nicolas-grekas reviewed Jul 28, 2016
View reviewed changes

@ExpectedException from Symfony

99fe32b

fabpot reviewed Jul 28, 2016
View reviewed changes

prefer isset

9b2e4d4

fabpot closed this Jul 28, 2016

fabpot reopened this Jul 28, 2016

ReenExe mentioned this pull request Jul 28, 2016

undefined offset fix (#19406) #19470

Closed

fabpot pushed a commit that referenced this pull request Jul 28, 2016

undefined offset fix (#19406)

9813888

fabpot added a commit that referenced this pull request Jul 28, 2016

Merge branch '2.7' into 2.8

77b5fc4

* 2.7: undefined offset fix (#19406) [EventDispatcher] Removed unused variable

fabpot closed this Jul 28, 2016

This was referenced Jul 30, 2016

Release v2.7.16 #19486

Merged

Release v2.8.9 #19487

Merged

Release v3.0.9 #19488

Merged

fabpot mentioned this pull request Sep 3, 2016

Release v3.1.4 #19838

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Console table cleanup #19406

Console table cleanup #19406

ReenExe commented Jul 22, 2016 •

edited

Loading

xabbuh Jul 23, 2016

ReenExe Jul 23, 2016 •

edited

Loading

nicolas-grekas Jul 25, 2016

ReenExe Jul 25, 2016

nicolas-grekas Jul 26, 2016

ReenExe Jul 26, 2016

nicolas-grekas Jul 26, 2016

ReenExe Jul 27, 2016

nicolas-grekas Jul 27, 2016

ReenExe Jul 27, 2016

nicolas-grekas Jul 28, 2016 •

edited

Loading

nicolas-grekas commented Jul 28, 2016

fabpot Jul 28, 2016

nicolas-grekas Jul 28, 2016

fabpot Jul 28, 2016

nicolas-grekas Jul 28, 2016

fabpot Jul 28, 2016

ReenExe Jul 28, 2016 •

edited

Loading

fabpot Jul 28, 2016

ReenExe Jul 28, 2016

fabpot commented Jul 28, 2016 •

edited

Loading

ReenExe commented Jul 28, 2016 •

edited

Loading

ReenExe commented Jul 28, 2016 •

edited

Loading

nicolas-grekas commented Jul 28, 2016

fabpot commented Jul 28, 2016

ReenExe commented Jul 28, 2016 •

edited

Loading

fabpot commented Jul 28, 2016

ReenExe commented Jul 28, 2016

ReenExe commented Jul 28, 2016

fabpot commented Jul 28, 2016

Console table cleanup #19406

Console table cleanup #19406

Conversation

ReenExe commented Jul 22, 2016 • edited Loading

Choose a reason for hiding this comment

ReenExe Jul 23, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nicolas-grekas Jul 28, 2016 • edited Loading

Choose a reason for hiding this comment

nicolas-grekas commented Jul 28, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ReenExe Jul 28, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fabpot commented Jul 28, 2016 • edited Loading

ReenExe commented Jul 28, 2016 • edited Loading

ReenExe commented Jul 28, 2016 • edited Loading

nicolas-grekas commented Jul 28, 2016

fabpot commented Jul 28, 2016

ReenExe commented Jul 28, 2016 • edited Loading

fabpot commented Jul 28, 2016

ReenExe commented Jul 28, 2016

ReenExe commented Jul 28, 2016

fabpot commented Jul 28, 2016

ReenExe commented Jul 22, 2016 •

edited

Loading

ReenExe Jul 23, 2016 •

edited

Loading

nicolas-grekas Jul 28, 2016 •

edited

Loading

ReenExe Jul 28, 2016 •

edited

Loading

fabpot commented Jul 28, 2016 •

edited

Loading

ReenExe commented Jul 28, 2016 •

edited

Loading

ReenExe commented Jul 28, 2016 •

edited

Loading

ReenExe commented Jul 28, 2016 •

edited

Loading