From 24f5cda1419b7d406dd3883bfa2f691b43ef8cea Mon Sep 17 00:00:00 2001 From: torreytsui Date: Fri, 10 Aug 2018 09:02:03 +0100 Subject: [PATCH 1/5] Set up github token on travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9bd7838..2229073 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,7 @@ before_install: - phpenv config-rm xdebug.ini || true - composer self-update - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; composer config prefer-stable true; fi; + - if [ "$GITHUB_TOKEN" != "" ]; then composer config github-oauth.github.com $GITHUB_TOKEN; fi - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) From fa213e7d0fe746663379d4594f40fca5d87017ac Mon Sep 17 00:00:00 2001 From: torreytsui Date: Fri, 10 Aug 2018 09:14:51 +0100 Subject: [PATCH 2/5] (TO-BE-REMOVED) Test with hard-coded GITHUB_TOKEN --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2229073..f85b740 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ env: - KERNEL_CLASS=Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Tests\Fixtures\App\Kernel - SYMFONY_PHPUNIT_VERSION=5.7 - TEST_INSTALLATION=false + - GITHUB_TOKEN=50f7b2dd2c8b74e441a1da1010e1a45e6c2e69f9 matrix: include: From d3907816839a2ac89da1a69c680a9eec944b7b56 Mon Sep 17 00:00:00 2001 From: torreytsui Date: Fri, 10 Aug 2018 09:20:29 +0100 Subject: [PATCH 3/5] Increase travis composer update mem limit to -1 So as to workaround this issue: [1803.3MB/30.33s] Looking at all rules. [1803.7MB/32.78s] [1803.8MB/34.62s] Something's changed, looking at all rules again (pass [1803.9MB/36.24s] Something's change[1804.0MB/37.85s] Something's change[1804.1MB/39.62s] Something's change[1804.1MB/41.38s] Something's change[1804.2MB/42.99s] Something's change[1804.3MB/44.62s] Something's change[1804.4MB/46.24s] Something's change[1804.5MB/47.92s] Something's change[1804.6MB/49.69s] Something's change[1804.7MB/51.42s] Something's change[1804.7MB/53.20s] Something's change[1804.8MB/54.85s] Something's change[1804.9MB/56.57s] Something's change[1805.0MB/58.22s] Something's change[1805.1MB/59.83s] Something's change[1805.2MB/62.32s] Something's change[1805.3MB/64.74s] Something's change[1805.3MB/66.65s] Something's change[1805.4MB/68.62s] Something's change[1805.5MB/70.46s] Something's change[1805.6MB/72.27s] Something's change[1805.7MB/74.92s] Something's change[1805.8MB/77.31s] Something's change[1805.8MB/79.74s] Something's change[1805.9MB/81.62s] Something's change[1806.0MB/83.27s] Something's change[1806.1MB/84.89s] Something's change[1806.2MB/86.56s] Something's change[1806.3MB/88.26s] Something's change[1806.3MB/89.98s] Something's change[1806.4MB/91.80s] Something's change[1806.5MB/93.86s] Something's change[1806.6MB/95.61s] Something's change[1806.7MB/97.29s] Something's change[1806.8MB/98.98s] Something's changed[1806.9MB/100.54s] Something's changed[1807.0MB/102.17s] Something's changed[1807.0MB/103.85s] Something's changed[1807.1MB/105.39s] Something's changed[1807.2MB/107.19s] Something's changed[1807.3MB/108.74s] Something's changed[1807.4MB/110.25s] Something's changed[1807.4MB/111.87s] Something's changed[1807.5MB/113.41s] Something's changed[1807.6MB/114.97s] Something's changed[1807.7MB/116.55s] Something's changed[1807.7MB/118.10s] Something's changed[1807.8MB/119.68s] Something's changed[1807.9MB/121.52s] Something's changed[1807.9MB/123.31s] Something's changed[1808.0MB/125.24s] Something's changed[1808.1MB/127.06s] Something's changed[1808.2MB/129.15s] Something's changed[1808.2MB/131.08s] Something's changed[1808.3MB/132.96s] Something's changed[1808.4MB/134.68s] Something's changed[1808.5MB/137.08s] Something's changed[1808.5MB/138.87s] Something's changed[1808.6MB/140.93s] Something's changed[1808.7MB/142.68s] Something's changed[1808.8MB/144.36s] Something's changed[1808.7MB/147.64s] Something's changed[1809.1MB/151.19s] Something's changed[1809.1MB/153.04s] Something's changed[1809.2MB/155.03s] Something's changed[1809.2MB/156.93s] Something's changed[1809.3MB/158.97s] Something's changed[1809.3MB/161.97s] Something's changed[1809.4MB/164.36s] Something's changed[1809.5MB/166.34s] Something's changed[1809.6MB/169.33s] Something's changed[1809.6MB/171.15s] Something's changed[1809.7MB/174.53s] Something's changed[1809.8MB/177.61s] Something's changed[1809.8MB/182.94s] Something's changed[1809.9MB/185.59s] Something's changed[1810.0MB/187.39s] Something's changed[1810.0MB/189.16s] Something's changed[1810.1MB/191.54s] Something's changed[1810.2MB/194.12s] Something's changed[1810.4MB/196.27s] Something's changed[1810.5MB/198.69s] Something's changed[1810.6MB/200.96s] Something's changed[1810.7MB/203.53s] Something's changed[1810.8MB/205.77s] Something's changed[1811.0MB/208.21s] Something's changed[1811.1MB/210.62s] Something's changed[1811.2MB/213.05s] Something's changed[1811.3MB/215.22s] Something's changed[1811.4MB/217.65s] Something's changed[1811.5MB/219.37s] Something's changed[1811.7MB/222.18s] Something's changed[1811.9MB/224.54s] Something's changed[1812.0MB/226.52s] Something's changed[1812.1MB/228.64s] Something's changed[1812.3MB/230.06s] Something's changed[1812.4MB/232.31s] Something's changed[1812.5MB/233.80s] Something's changed[1812.8MB/235.74s] Something's changed[1813.0MB/237.79s] Something's changed[1814.4MB/239.69s] Something's changed[1814.4MB/241.57s] Something's changed[1815.4MB/244.29s] Something's changed[1815.6MB/246.05s] Something's changed[1815.0MB/247.64s] Something's changed[1815.9MB/249.36s] Something's changed[1815.6MB/251.03s] Something's changed[1815.1MB/252.57s] Something's changed[1815.9MB/254.28s] Something's changed[1815.7MB/256.27s] Something's changed[1815.1MB/258.08s] Something's changed[1816.0MB/259.63s] Something's changed[1815.7MB/261.19s] Something's changed[1815.1MB/262.62s] Something's changed[1816.0MB/264.14s] Something's changed[1815.7MB/265.97s] Something's change[1815.2MB/268.18s] Something's changed[1816.0MB/270.62s] Something's changed[1815.8MB/273.69s] Something's changed[1815.2MB/276.37s] Something's changed[1816.1MB/278.07s] Something's changed[1815.8MB/280.72s] Something's changed[1815.3MB/282.86s] Something's changed[1816.1MB/284.42s] Something's changed[1815.9MB/286.00s] Something's changed[1815.3MB/287.68s] Something's changed[1816.2MB/289.27s] Something's changed[1815.9MB/291.19s] Something's changed[1815.3MB/293.51s] Something's changed[1816.2MB/295.98s] Something's changed[1815.9MB/297.73s] Something's changed[1815.4MB/301.00s] Something's changed[1816.2MB/304.83s] Something's changed[1816.0MB/306.54s] Something's changed[1815.4MB/308.09s] Something's changed[1816.3MB/309.77s] Something's changed[1816.0MB/311.25s] Something's changed[1815.4MB/312.76s] Something's changed[1816.3MB/314.37s] Something's changed[1816.1MB/316.05s] Something's changed, looking at all rules again (pass #142)^CCommand terminated abnormally. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f85b740..67eea71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ before_install: - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) -install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS +install: COMPOSER_MEMORY_LIMIT=-1 travis_wait composer update --prefer-dist $COMPOSER_FLAGS script: - if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi From ae7208259de59677b1eb3570927fce38c6c12528 Mon Sep 17 00:00:00 2001 From: torreytsui Date: Fri, 10 Aug 2018 11:09:33 +0100 Subject: [PATCH 4/5] Git ignore .idea --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cc7c2c8..114aba6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.idea tests/Fixtures/App/var/cache tests/Fixtures/App/var/logs !tests/Fixtures/App/var/.gitempty From 09e2849786d5b6a94f569dd354cc8c67a40979e0 Mon Sep 17 00:00:00 2001 From: torreytsui Date: Fri, 10 Aug 2018 13:00:18 +0100 Subject: [PATCH 5/5] Go through all list mapper add() and upgrade to class syntax --- tests/Fixtures/App/Admin/BaseAdmin.php | 8 +++++--- tests/Fixtures/App/Admin/MenuContentAdmin.php | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/Fixtures/App/Admin/BaseAdmin.php b/tests/Fixtures/App/Admin/BaseAdmin.php index 3db1faf..3e36bee 100644 --- a/tests/Fixtures/App/Admin/BaseAdmin.php +++ b/tests/Fixtures/App/Admin/BaseAdmin.php @@ -15,6 +15,8 @@ use Sonata\AdminBundle\Datagrid\ListMapper; use Sonata\AdminBundle\Form\FormMapper; use Sonata\DoctrinePHPCRAdminBundle\Admin\Admin; +use Symfony\Component\Form\Extension\Core\Type\TextareaType; +use Symfony\Component\Form\Extension\Core\Type\TextType; /** * @author Maximilian Berghoff @@ -38,9 +40,9 @@ protected function configureFormFields(FormMapper $formMapper) { $formMapper ->with('form.group_general') - ->add('name', 'text') - ->add('title', 'text') - ->add('body', 'textarea', ['required' => false]) + ->add('name', TextType::class) + ->add('title', TextType::class) + ->add('body', TextareaType::class, ['required' => false]) ->end() ; } diff --git a/tests/Fixtures/App/Admin/MenuContentAdmin.php b/tests/Fixtures/App/Admin/MenuContentAdmin.php index 129e2ae..ee47080 100644 --- a/tests/Fixtures/App/Admin/MenuContentAdmin.php +++ b/tests/Fixtures/App/Admin/MenuContentAdmin.php @@ -14,6 +14,7 @@ use Sonata\AdminBundle\Datagrid\ListMapper; use Sonata\AdminBundle\Form\FormMapper; use Sonata\DoctrinePHPCRAdminBundle\Admin\Admin; +use Symfony\Component\Form\Extension\Core\Type\TextType; /** * Common base admin for Menu and MenuNode. @@ -42,7 +43,7 @@ protected function configureFormFields(FormMapper $formMapper) { $formMapper ->with('form.group_general') - ->add('title', 'text') + ->add('title', TextType::class) ->end() ; }