1. 11 Sep, 2019 5 commits
  2. 10 Sep, 2019 11 commits
  3. 09 Sep, 2019 4 commits
  4. 08 Sep, 2019 3 commits
  5. 07 Sep, 2019 10 commits
  6. 06 Sep, 2019 7 commits
    • eileen's avatar
      #1236 fix miscasting on setContactSubType · a98c8ecb
      eileen authored
      I think it makes sense to cast here rather than require a string
      a98c8ecb
    • totten's avatar
      SyntaxConformanceTest::testSqlOperators - Skip "Dedupe" entity on MySQL 5.5 · 382c48e1
      totten authored
      Overview
      --------
      
      This disables a particularly flaky test-scenario.
      
      Technical Details
      -----------------
      
      The `SyntaxConformanceTest::testSqlOperators()` has been rather flaky for a
      while.  (I think this goes back either to the creation of the test or the
      expansion of Dedupe API -- in other words, the test of this scenario has
      always been flaky.)
      
      When the test fails, it looks like this:
      
      ```
      api_v3_SyntaxConformanceTest::testSqlOperators with data set #28 ('Dedupe')
      incorrect count returned from Dedupe getcount
      Failed asserting that 0 matches expected 2.
      
      /home/jenkins/bknix-min/build/build-1/web/sites/all/modules/civicrm/Civi/Test/Api3TestTrait.php:191
      /home/jenkins/bknix-min/build/build-1/web/sites/all/modules/civicrm/tests/phpunit/api/v3/SyntaxConformanceTest.php:1131
      /home/jenkins/bknix-min/build/build-1/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:215
      /home/jenkins/bknix-min/civicrm-buildkit/extern/phpunit6/phpunit6.phar:570
      ```
      
      I've spent a chunk of time investigating the flakiness and found:
      
      1. The test usually (possibly always?) passes on MySQL 5.7.
      2. The test often (but not always) fails on MySQL 5.5.
      3. The version of PHP (php70 vs php72) does not make much difference.
      4. The test never seems to fail when run by itself. The smallest
         scenario which seemd to reliably produce the failure was:
         ```
          env
            SYNTAX_CONFORMANCE_ENTITIES='ContactType Country Dedupe Domain StateProvince' \
            CIVICRM_UF=UnitTests \
            phpunit5 \
            --stop-on-failure --tap \
            tests/phpunit/api/v3/SyntaxConformanceTest.php \
            --filter '(testCustomDataGet|testLimit|testSqlOperators)'
          ```
      5. The reproducibility differed on two laptops.  The laptops were largely
         identical wrt PHP/MySQL binaries+configuration (macOS,
         bknix@master-loco, `min` cfg). They differed in OS version
         and hardware specs. The slower machine (low-wattage 2-core CPU; 8gb; Mojave)
         produced test-failures much more reliably than the faster machine
         (high-wattage 4-core CPU; 16gb; Sierra).
      
      Rationalizations for why it's OK to sip:
      
      * The test will continue to be monitored on MySQL 5.7+.
      * The test *does* pass reliably when run by itself on MySQL 5.5.
      * [Civi doesn't officially support MySQL 5.5](https://docs.civicrm.org/sysadmin/en/latest/requirements/#mysql-version),
      so we're not required to faff-about over a failure that only occurs on MySQL 5.5.
      
      See also: https://chat.civicrm.org/civicrm/pl/s7nbkro8yjfgzk5z4epo8g9jph
      382c48e1
    • Seamus Lee's avatar
      Fix deleting of campaigns and saving of custom data for campaign and also... · 1107b319
      Seamus Lee authored
      Fix deleting of campaigns and saving of custom data for campaign and also ensure that goal_general is not html encoded as it is a wysiwyg field
      1107b319
    • gitsync's avatar
      Set version to 5.18.beta1 · 804ce138
      gitsync authored
      804ce138
    • Eileen McNaughton's avatar
      Merge pull request #15227 from eileenmcnaughton/dedupe · 2434aafc
      Eileen McNaughton authored
      #1230 Permission nuancing, fix another place where merge duplicate contacts should be enough
      2434aafc
    • Eileen McNaughton's avatar
      Merge pull request #15226 from eileenmcnaughton/headers3 · 90d53fd7
      Eileen McNaughton authored
      [Ref] [Import] Final round in the cleanup Load Mapping form epic
      90d53fd7
    • Monish Deb's avatar
      Merge pull request #15143 from eileenmcnaughton/p4 · ced85e8f
      Monish Deb authored
      Stop adding a refund payment from creating extraneous financial items
      ced85e8f