fix tests

PHPOffice · Dec 13, 2017 · 5a57409 · 5a57409
1 parent ad38d4c
commit 5a57409
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
@@ -162,7 +162,7 @@ public function getAlgorithm()
  * @param $algorithm
  * @return self
  */
- public function setMswordAlgorithmSid($algorithm)
+ public function setAlgorithm($algorithm)
  {
  $this->algorithm = $algorithm;
 

diff --git a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
@@ -162,6 +162,17 @@ private static function getAlgorithm($algorithmName)
  return $algorithm;
  }
 
+ /**
+ * Returns the algorithm ID
+ *
+ * @param sting $algorithmName
+ * @return int
+ */
+ public static function getAlgorithmId($algorithmName)
+ {
+ return self::$algorithmMapping[$algorithmName][0];
+ }
+
  /**
  * Build combined key from low-order word and high-order word
  *

diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -183,7 +183,7 @@ private function setOnOffValue($settingName, $booleanValue)
  private function setDocumentProtection($documentProtection)
  {
  if ($documentProtection->getEditing() !== null) {
- if (empty($documentProtection->getPassword())) {
+ if ($documentProtection->getPassword() == null) {
  $this->settings['w:documentProtection'] = array(
  '@attributes' => array(
  'w:enforcement' => 1,
@@ -202,7 +202,7 @@ private function setDocumentProtection($documentProtection)
  'w:cryptProviderType' => 'rsaFull',
  'w:cryptAlgorithmClass' => 'hash',
  'w:cryptAlgorithmType' => 'typeAny',
- 'w:cryptAlgorithmSid' => $documentProtection->getMswordAlgorithmSid(),
+ 'w:cryptAlgorithmSid' => PasswordEncoder::getAlgorithmId($documentProtection->getAlgorithm()),
  'w:cryptSpinCount' => $documentProtection->getSpinCount(),
  'w:hash' => $passwordHash,
  'w:salt' => base64_encode($documentProtection->getSalt()),

diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -24,6 +24,7 @@
 use PhpOffice\PhpWord\SimpleType\Zoom;
 use PhpOffice\PhpWord\Style\Language;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Settings
@@ -65,7 +66,7 @@ public function testDocumentProtectionWithPassword()
  $phpWord->getSettings()->getDocumentProtection()->setEditing('readOnly');
  $phpWord->getSettings()->getDocumentProtection()->setPassword('testÄö@€!$&');
  $phpWord->getSettings()->getDocumentProtection()->setSalt(base64_decode('uq81pJRRGFIY5U+E9gt8tA=='));
- $phpWord->getSettings()->getDocumentProtection()->setMswordAlgorithmSid(1);
+ $phpWord->getSettings()->getDocumentProtection()->setAlgorithm(PasswordEncoder::ALGORITHM_MD2);
  $phpWord->getSettings()->getDocumentProtection()->setSpinCount(10);
 
  $doc = TestHelperDOCX::getDocument($phpWord);