revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-28 16:30:59 +01:00
Code Issues Releases Wiki Activity

Attempt to workaround non-deterministic sort behavior

Browse source 
Summary: Ref T6861. Some discussion in IRC. The behavior of `sort` is somewhat broken when dealing with mixed types. In this particular case, we have both integers and strings.

Test Plan: @epriestley confirmed that this made the ordering of the Celerity map slightly-more-sane.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin, epriestley

Maniphest Tasks: T6861

Differential Revision: https://secure.phabricator.com/D11210
This commit is contained in:
Joshua Spence 2015-01-05 08:23:22 +11:00
parent 85a3636747
commit 85b26964f1
2 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
resources/celerity/map.php
View file

@ -850,20 +850,6 @@ return array(
'javelin-stratcom', 'javelin-stratcom',
'javelin-workflow', 'javelin-workflow',
), ),
'7319e029' => array(
'javelin-behavior',
'javelin-dom',
),
'97258e55' => array(
'javelin-install',
'javelin-stratcom',
'javelin-util',
'javelin-behavior',
'javelin-json',
'javelin-dom',
'javelin-resource',
'javelin-routable',
),
'06e05112' => array( '06e05112' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-stratcom', 'javelin-stratcom',
@ -1075,6 +1061,11 @@ return array(
'phuix-action-list-view', 'phuix-action-list-view',
'phuix-action-view', 'phuix-action-view',
), ),
42126667 => array(
'javelin-behavior',
'javelin-dom',
'javelin-request',
),
'44168bad' => array( '44168bad' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-dom', 'javelin-dom',
@ -1094,6 +1085,11 @@ return array(
'javelin-dom', 'javelin-dom',
'javelin-reactor-dom', 'javelin-reactor-dom',
), ),
48086888 => array(
'javelin-behavior',
'javelin-dom',
'javelin-workflow',
),
'49b73b36' => array( '49b73b36' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-dom', 'javelin-dom',
@ -1189,6 +1185,10 @@ return array(
'javelin-workflow', 'javelin-workflow',
'javelin-stratcom', 'javelin-stratcom',
), ),
60479091 => array(
'phabricator-busy',
'javelin-behavior',
),
'60821bc7' => array( '60821bc7' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-stratcom', 'javelin-stratcom',
@ -1258,6 +1258,10 @@ return array(
'javelin-stratcom', 'javelin-stratcom',
'phabricator-prefab', 'phabricator-prefab',
), ),
'7319e029' => array(
'javelin-behavior',
'javelin-dom',
),
'76b9fc3e' => array( '76b9fc3e' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-stratcom', 'javelin-stratcom',
@ -1316,6 +1320,14 @@ return array(
'javelin-behavior', 'javelin-behavior',
'javelin-history', 'javelin-history',
), ),
82439934 => array(
'javelin-behavior',
'javelin-dom',
'javelin-util',
'javelin-stratcom',
'javelin-workflow',
'phabricator-draggable-list',
),
'82ce2142' => array( '82ce2142' => array(
'aphront-typeahead-control-css', 'aphront-typeahead-control-css',
), ),
@ -1409,6 +1421,16 @@ return array(
'javelin-workflow', 'javelin-workflow',
'javelin-util', 'javelin-util',
), ),
'97258e55' => array(
'javelin-install',
'javelin-stratcom',
'javelin-util',
'javelin-behavior',
'javelin-json',
'javelin-dom',
'javelin-resource',
'javelin-routable',
),
'988040b4' => array( '988040b4' => array(
'javelin-install', 'javelin-install',
'javelin-dom', 'javelin-dom',
@ -1939,28 +1961,6 @@ return array(
'phabricator-prefab', 'phabricator-prefab',
'javelin-json', 'javelin-json',
), ),
42126667 => array(
'javelin-behavior',
'javelin-dom',
'javelin-request',
),
48086888 => array(
'javelin-behavior',
'javelin-dom',
'javelin-workflow',
),
60479091 => array(
'phabricator-busy',
'javelin-behavior',
),
82439934 => array(
'javelin-behavior',
'javelin-dom',
'javelin-util',
'javelin-stratcom',
'javelin-workflow',
'phabricator-draggable-list',
),
), ),
'packages' => array( 'packages' => array(
'core.pkg.css' => array( 'core.pkg.css' => array(

8
src/applications/celerity/CelerityResourceMapGenerator.php
View file

@ -97,10 +97,10 @@ final class CelerityResourceMapGenerator {
)); ));
$package_map = ipull($package_map, 'symbols'); $package_map = ipull($package_map, 'symbols');
ksort($name_map); ksort($name_map, SORT_STRING);
ksort($symbol_map); ksort($symbol_map, SORT_STRING);
ksort($requires_map); ksort($requires_map, SORT_STRING);
ksort($package_map); ksort($package_map, SORT_STRING);
$this->nameMap = $name_map; $this->nameMap = $name_map;
$this->symbolMap = $symbol_map; $this->symbolMap = $symbol_map;